From 6264161e9e6f7172d0de290983fb5123f8d8d6f7 Mon Sep 17 00:00:00 2001 From: Stephen Gutekanst Date: Wed, 16 Mar 2022 21:10:50 -0700 Subject: [PATCH] gpu: implement RenderBundleEncoder.insertDebugMarker Signed-off-by: Stephen Gutekanst --- gpu/src/NativeInstance.zig | 10 +++++----- gpu/src/RenderBundleEncoder.zig | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/gpu/src/NativeInstance.zig b/gpu/src/NativeInstance.zig index af9bff1a..8308b190 100644 --- a/gpu/src/NativeInstance.zig +++ b/gpu/src/NativeInstance.zig @@ -1173,6 +1173,11 @@ const render_bundle_encoder_vtable = RenderBundleEncoder.VTable{ return wrapRenderBundle(c.wgpuRenderBundleEncoderFinish(@ptrCast(c.WGPURenderBundleEncoder, ptr), &desc)); } }).finish, + .insertDebugMarker = (struct { + pub fn insertDebugMarker(ptr: *anyopaque, marker_label: [*:0]const u8) void { + c.wgpuRenderBundleEncoderInsertDebugMarker(@ptrCast(c.WGPURenderBundleEncoder, ptr), marker_label); + } + }).insertDebugMarker, // .beginOcclusionQuery = (struct { // pub fn beginOcclusionQuery(ptr: *anyopaque, query_index: u32) void { // c.wgpuRenderBundleEncoderBeginOcclusionQuery(@ptrCast(c.WGPURenderBundleEncoder, ptr), query_index); @@ -1207,11 +1212,6 @@ const render_bundle_encoder_vtable = RenderBundleEncoder.VTable{ // ); // } // }).executeBundles, - // .insertDebugMarker = (struct { - // pub fn insertDebugMarker(ptr: *anyopaque, marker_label: [*:0]const u8) void { - // c.wgpuRenderBundleEncoderInsertDebugMarker(@ptrCast(c.WGPURenderBundleEncoder, ptr), marker_label); - // } - // }).insertDebugMarker, // .popDebugGroup = (struct { // pub fn popDebugGroup(ptr: *anyopaque) void { // c.wgpuRenderBundleEncoderPopDebugGroup(@ptrCast(c.WGPURenderBundleEncoder, ptr)); diff --git a/gpu/src/RenderBundleEncoder.zig b/gpu/src/RenderBundleEncoder.zig index a8e5efb3..72b56688 100644 --- a/gpu/src/RenderBundleEncoder.zig +++ b/gpu/src/RenderBundleEncoder.zig @@ -30,8 +30,7 @@ pub const VTable = struct { drawIndexedIndirect: fn (ptr: *anyopaque, indirect_buffer: Buffer, indirect_offset: u64) void, drawIndirect: fn (ptr: *anyopaque, indirect_buffer: Buffer, indirect_offset: u64) void, finish: fn (ptr: *anyopaque, descriptor: *const RenderBundle.Descriptor) RenderBundle, - // insertDebugMarker: fn (ptr: *anyopaque, marker_label: [*:0]const u8) void, - // WGPU_EXPORT void wgpuRenderBundleEncoderInsertDebugMarker(WGPURenderBundleEncoder renderBundleEncoder, char const * markerLabel); + insertDebugMarker: fn (ptr: *anyopaque, marker_label: [*:0]const u8) void, // popDebugGroup: fn (ptr: *anyopaque) void, // WGPU_EXPORT void wgpuRenderBundleEncoderPopDebugGroup(WGPURenderBundleEncoder renderBundleEncoder); // pushDebugGroup: fn (ptr: *anyopaque, group_label: [*:0]const u8) void, @@ -88,6 +87,10 @@ pub inline fn finish(enc: RenderBundleEncoder, descriptor: *const RenderBundle.D return enc.vtable.finish(enc.ptr, descriptor); } +pub inline fn insertDebugMarker(enc: RenderBundleEncoder, marker_label: [*:0]const u8) void { + enc.vtable.insertDebugMarker(enc.ptr, marker_label); +} + // pub inline fn beginOcclusionQuery(enc: RenderBundleEncoder, query_index: u32) void { // enc.vtable.beginOcclusionQuery(enc.ptr, query_index); // } @@ -100,10 +103,6 @@ pub inline fn finish(enc: RenderBundleEncoder, descriptor: *const RenderBundle.D // enc.vtable.executeBundles(enc.ptr, bundles); // } -// pub inline fn insertDebugMarker(enc: RenderBundleEncoder, marker_label: [*:0]const u8) void { -// enc.vtable.insertDebugMarker(enc.ptr, marker_label); -// } - // pub inline fn popDebugGroup(enc: RenderBundleEncoder) void { // enc.vtable.popDebugGroup(enc.ptr); // } @@ -195,5 +194,6 @@ test { _ = drawIndexedIndirect; _ = drawIndirect; _ = finish; + _ = insertDebugMarker; _ = Descriptor; }