From 143567e1c0e7bcfe56594484395768bfe7090753 Mon Sep 17 00:00:00 2001 From: Stephen Gutekanst Date: Fri, 11 Mar 2022 22:30:55 -0700 Subject: [PATCH] gpu: implement CommandEncoder.finish Signed-off-by: Stephen Gutekanst --- gpu/src/CommandEncoder.zig | 7 ++++++- gpu/src/NativeInstance.zig | 9 +++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/gpu/src/CommandEncoder.zig b/gpu/src/CommandEncoder.zig index e3e02938..2dc2baea 100644 --- a/gpu/src/CommandEncoder.zig +++ b/gpu/src/CommandEncoder.zig @@ -1,4 +1,5 @@ const RenderPassEncoder = @import("RenderPassEncoder.zig"); +const CommandBuffer = @import("CommandBuffer.zig"); const CommandEncoder = @This(); @@ -19,7 +20,7 @@ pub const VTable = struct { // WGPU_EXPORT void wgpuCommandEncoderCopyTextureToBuffer(WGPUCommandEncoder commandEncoder, WGPUImageCopyTexture const * source, WGPUImageCopyBuffer const * destination, WGPUExtent3D const * copySize); // WGPU_EXPORT void wgpuCommandEncoderCopyTextureToTexture(WGPUCommandEncoder commandEncoder, WGPUImageCopyTexture const * source, WGPUImageCopyTexture const * destination, WGPUExtent3D const * copySize); // WGPU_EXPORT void wgpuCommandEncoderCopyTextureToTextureInternal(WGPUCommandEncoder commandEncoder, WGPUImageCopyTexture const * source, WGPUImageCopyTexture const * destination, WGPUExtent3D const * copySize); - // WGPU_EXPORT WGPUCommandBuffer wgpuCommandEncoderFinish(WGPUCommandEncoder commandEncoder, WGPUCommandBufferDescriptor const * descriptor); + finish: fn (ptr: *anyopaque, descriptor: ?*const CommandBuffer.Descriptor) CommandBuffer, // WGPU_EXPORT void wgpuCommandEncoderInjectValidationError(WGPUCommandEncoder commandEncoder, char const * message); // WGPU_EXPORT void wgpuCommandEncoderInsertDebugMarker(WGPUCommandEncoder commandEncoder, char const * markerLabel); // WGPU_EXPORT void wgpuCommandEncoderPopDebugGroup(WGPUCommandEncoder commandEncoder); @@ -38,6 +39,10 @@ pub inline fn release(enc: CommandEncoder) void { enc.vtable.release(enc.ptr); } +pub inline fn finish(enc: CommandEncoder, descriptor: ?*const CommandBuffer.Descriptor) CommandBuffer { + return enc.vtable.finish(enc.ptr, descriptor); +} + pub inline fn setLabel(enc: CommandEncoder, label: [:0]const u8) void { enc.vtable.setLabel(enc.ptr, label); } diff --git a/gpu/src/NativeInstance.zig b/gpu/src/NativeInstance.zig index 3796ccd2..8678809d 100644 --- a/gpu/src/NativeInstance.zig +++ b/gpu/src/NativeInstance.zig @@ -1006,6 +1006,15 @@ const command_encoder_vtable = CommandEncoder.VTable{ c.wgpuCommandEncoderRelease(@ptrCast(c.WGPUCommandEncoder, ptr)); } }).release, + .finish = (struct { + pub fn finish(ptr: *anyopaque, descriptor: ?*const CommandBuffer.Descriptor) CommandBuffer { + const desc: ?*c.WGPUCommandBufferDescriptor = if (descriptor) |d| &.{ + .nextInChain = null, + .label = if (d.label) |l| l else "", + } else null; + return wrapCommandBuffer(c.wgpuCommandEncoderFinish(@ptrCast(c.WGPUCommandEncoder, ptr), desc)); + } + }).finish, .setLabel = (struct { pub fn setLabel(ptr: *anyopaque, label: [:0]const u8) void { c.wgpuCommandEncoderSetLabel(@ptrCast(c.WGPUCommandEncoder, ptr), label);