WebGPU wrapper wip: add queue methods

This commit is contained in:
Nikita Lisitsa 2023-12-30 23:47:02 +03:00
parent 5add6df083
commit 095b06d5f1
4 changed files with 91 additions and 2 deletions

View file

@ -1,14 +1,30 @@
#pragma once
#include <psemek/wgpu/chained_struct.hpp>
#include <psemek/wgpu/command_buffer.hpp>
#include <psemek/wgpu/buffer.hpp>
#include <psemek/wgpu/texture.hpp>
#include <psemek/wgpu/detail/object.hpp>
#include <psemek/geom/point.hpp>
#include <psemek/util/span.hpp>
#include <string>
#include <vector>
#include <cstdint>
#include <functional>
namespace psemek::wgpu
{
struct image_copy_texture
{
std::vector<chained_struct> chain = {};
struct texture texture;
std::uint32_t mipLevel = 0;
geom::point<std::uint32_t, 3> origin = {0, 0, 0};
texture::aspect aspect = texture::aspect::all;
};
struct queue
: detail::object<queue>
{
@ -20,6 +36,22 @@ namespace psemek::wgpu
std::string label = {};
};
enum class work_done_status : std::uint32_t
{
success = 0x00000000,
error = 0x00000001,
unknown = 0x00000002,
device_lost = 0x00000003,
};
using work_done_callback = std::function<void(work_done_status)>;
void submit(std::vector<command_buffer> const & commands);
void write_buffer(buffer const & buffer, std::uint64_t offset, util::span<char const> data);
void write_texture(image_copy_texture const & dest, util::span<char const> data, texture::data_layout const & data_layout, geom::vector<std::uint32_t, 3> const & write_size);
void on_submitted_work_done(work_done_callback const & callback);
void set_label(std::string const & label);
static void reference(void * ptr);
static void release(void * ptr);

View file

@ -154,6 +154,14 @@ namespace psemek::wgpu
std::vector<enum format> view_formats = {};
};
struct data_layout
{
std::vector<chained_struct> chain = {};
std::uint64_t offset = 0;
std::uint32_t bytes_per_row;
std::uint32_t rows_per_image;
};
texture_view create_view(texture_view::descriptor const & desc);
void destroy();
std::uint32_t get_width();

View file

@ -2,7 +2,7 @@
WGPUBindGroup
WGPUBindGroupLayout
+ WGPUBuffer
WGPUCommandBuffer
+ WGPUCommandBuffer
WGPUCommandEncoder
WGPUComputePassEncoder
WGPUComputePipeline
@ -10,7 +10,7 @@
+ WGPUInstance
WGPUPipelineLayout
WGPUQuerySet
WGPUQueue
+ WGPUQueue
WGPURenderBundle
WGPURenderBundleEncoder
WGPURenderPassEncoder

View file

@ -4,6 +4,55 @@
namespace psemek::wgpu
{
void queue::submit(std::vector<command_buffer> const & commands)
{
static_assert(sizeof(WGPUCommandBuffer) == sizeof(command_buffer));
wgpuQueueSubmit((WGPUQueue)get(), commands.size(), (WGPUCommandBuffer*)commands.data());
}
void queue::write_buffer(buffer const & buffer, std::uint64_t offset, util::span<char const> data)
{
wgpuQueueWriteBuffer((WGPUQueue)get(), (WGPUBuffer)buffer.get(), offset, data.data(), data.size());
}
void queue::write_texture(image_copy_texture const & dest, util::span<char const> data, texture::data_layout const & data_layout, geom::vector<std::uint32_t, 3> const & write_size)
{
WGPUImageCopyTexture image_copy_texture = {};
image_copy_texture.nextInChain = (WGPUChainedStruct const *)detail::fill_chain(dest.chain);
image_copy_texture.texture = (WGPUTexture)dest.texture.get();
image_copy_texture.mipLevel = dest.mipLevel;
image_copy_texture.origin = {dest.origin[0], dest.origin[1], dest.origin[2]};
image_copy_texture.aspect = (WGPUTextureAspect)dest.aspect;
WGPUTextureDataLayout texture_data_layout = {};
texture_data_layout.nextInChain = (WGPUChainedStruct const *)detail::fill_chain(data_layout.chain);
texture_data_layout.offset = data_layout.offset;
texture_data_layout.bytesPerRow = data_layout.bytes_per_row;
texture_data_layout.rowsPerImage = data_layout.rows_per_image;
WGPUExtent3D extent = {write_size[0], write_size[1], write_size[2]};
wgpuQueueWriteTexture((WGPUQueue)get(), &image_copy_texture, data.data(), data.size(), &texture_data_layout, &extent);
}
void queue::on_submitted_work_done(work_done_callback const & callback)
{
auto userdata = new work_done_callback(callback);
auto real_callback = [](WGPUQueueWorkDoneStatus status, void * userdata)
{
std::unique_ptr<work_done_callback> callback((work_done_callback*)userdata);
if (*callback) (*callback)((work_done_status)status);
};
wgpuQueueOnSubmittedWorkDone((WGPUQueue)get(), real_callback, userdata);
}
void queue::set_label(std::string const & label)
{
wgpuQueueSetLabel((WGPUQueue)get(), label.data());
}
void queue::reference(void * ptr)
{
wgpuQueueReference((WGPUQueue)ptr);