From 7c2d097625e177186e8c64b8255a7a87a8835699 Mon Sep 17 00:00:00 2001
From: Stephen Gutekanst <stephen@hexops.com>
Date: Wed, 16 Mar 2022 21:11:37 -0700
Subject: [PATCH] gpu: implement RenderBundleEncoder.popDebugGroup

Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
---
 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 8308b190..4f4f835b 100644
--- a/gpu/src/NativeInstance.zig
+++ b/gpu/src/NativeInstance.zig
@@ -1178,6 +1178,11 @@ const render_bundle_encoder_vtable = RenderBundleEncoder.VTable{
             c.wgpuRenderBundleEncoderInsertDebugMarker(@ptrCast(c.WGPURenderBundleEncoder, ptr), marker_label);
         }
     }).insertDebugMarker,
+    .popDebugGroup = (struct {
+        pub fn popDebugGroup(ptr: *anyopaque) void {
+            c.wgpuRenderBundleEncoderPopDebugGroup(@ptrCast(c.WGPURenderBundleEncoder, ptr));
+        }
+    }).popDebugGroup,
     // .beginOcclusionQuery = (struct {
     //     pub fn beginOcclusionQuery(ptr: *anyopaque, query_index: u32) void {
     //         c.wgpuRenderBundleEncoderBeginOcclusionQuery(@ptrCast(c.WGPURenderBundleEncoder, ptr), query_index);
@@ -1212,11 +1217,6 @@ const render_bundle_encoder_vtable = RenderBundleEncoder.VTable{
     //         );
     //     }
     // }).executeBundles,
-    // .popDebugGroup = (struct {
-    //     pub fn popDebugGroup(ptr: *anyopaque) void {
-    //         c.wgpuRenderBundleEncoderPopDebugGroup(@ptrCast(c.WGPURenderBundleEncoder, ptr));
-    //     }
-    // }).popDebugGroup,
     // .pushDebugGroup = (struct {
     //     pub fn pushDebugGroup(ptr: *anyopaque, group_label: [*:0]const u8) void {
     //         c.wgpuRenderBundleEncoderPushDebugGroup(@ptrCast(c.WGPURenderBundleEncoder, ptr), group_label);
diff --git a/gpu/src/RenderBundleEncoder.zig b/gpu/src/RenderBundleEncoder.zig
index 72b56688..3e49291e 100644
--- a/gpu/src/RenderBundleEncoder.zig
+++ b/gpu/src/RenderBundleEncoder.zig
@@ -31,8 +31,7 @@ pub const VTable = struct {
     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,
-    // popDebugGroup: fn (ptr: *anyopaque) void,
-    // WGPU_EXPORT void wgpuRenderBundleEncoderPopDebugGroup(WGPURenderBundleEncoder renderBundleEncoder);
+    popDebugGroup: fn (ptr: *anyopaque) void,
     // pushDebugGroup: fn (ptr: *anyopaque, group_label: [*:0]const u8) void,
     // WGPU_EXPORT void wgpuRenderBundleEncoderPushDebugGroup(WGPURenderBundleEncoder renderBundleEncoder, char const * groupLabel);
     // setBindGroup: fn (ptr: *anyopaque, group_index: u32, group: BindGroup, dynamic_offsets: []u32) void,
@@ -91,6 +90,10 @@ pub inline fn insertDebugMarker(enc: RenderBundleEncoder, marker_label: [*:0]con
     enc.vtable.insertDebugMarker(enc.ptr, marker_label);
 }
 
+pub inline fn popDebugGroup(enc: RenderBundleEncoder) void {
+    enc.vtable.popDebugGroup(enc.ptr);
+}
+
 // pub inline fn beginOcclusionQuery(enc: RenderBundleEncoder, query_index: u32) void {
 //     enc.vtable.beginOcclusionQuery(enc.ptr, query_index);
 // }
@@ -103,10 +106,6 @@ pub inline fn insertDebugMarker(enc: RenderBundleEncoder, marker_label: [*:0]con
 //     enc.vtable.executeBundles(enc.ptr, bundles);
 // }
 
-// pub inline fn popDebugGroup(enc: RenderBundleEncoder) void {
-//     enc.vtable.popDebugGroup(enc.ptr);
-// }
-
 // pub inline fn pushDebugGroup(enc: RenderBundleEncoder, group_label: [*:0]const u8) void {
 //     enc.vtable.pushDebugGroup(enc.ptr, group_label);
 // }
@@ -195,5 +194,6 @@ test {
     _ = drawIndirect;
     _ = finish;
     _ = insertDebugMarker;
+    _ = popDebugGroup;
     _ = Descriptor;
 }