From 4ef2164b2ee2c73d34ce29d5cd2e3dea25e1bd10 Mon Sep 17 00:00:00 2001
From: Stephen Gutekanst <stephen@hexops.com>
Date: Sat, 30 Jul 2022 21:52:03 -0700
Subject: [PATCH] gpu: correct renderBundleEncoderFinish signature

Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
---
 gpu/src/dawn_impl.zig             | 7 +++----
 gpu/src/interface.zig             | 8 ++++----
 gpu/src/render_bundle_encoder.zig | 4 ++--
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/gpu/src/dawn_impl.zig b/gpu/src/dawn_impl.zig
index c157254d..efe4455b 100644
--- a/gpu/src/dawn_impl.zig
+++ b/gpu/src/dawn_impl.zig
@@ -806,12 +806,11 @@ pub const Interface = gpu.Interface(struct {
         );
     }
 
-    pub inline fn renderBundleEncoderFinish(render_bundle_encoder: *gpu.RenderBundleEncoder, descriptor: ?*const gpu.RenderBundle.Descriptor) void {
-        // TODO: our signature is wrong!
-        _ = procs.renderBundleEncoderFinish.?(
+    pub inline fn renderBundleEncoderFinish(render_bundle_encoder: *gpu.RenderBundleEncoder, descriptor: ?*const gpu.RenderBundle.Descriptor) *gpu.RenderBundle {
+        return @ptrCast(*gpu.RenderBundle, procs.renderBundleEncoderFinish.?(
             @ptrCast(c.WGPURenderBundleEncoder, render_bundle_encoder),
             @ptrCast(*const c.WGPURenderBundleDescriptor, descriptor),
-        );
+        ));
     }
 
     pub inline fn renderBundleEncoderInsertDebugMarker(render_bundle_encoder: *gpu.RenderBundleEncoder, marker_label: [*:0]const u8) void {
diff --git a/gpu/src/interface.zig b/gpu/src/interface.zig
index 635cfca1..e2336cc8 100644
--- a/gpu/src/interface.zig
+++ b/gpu/src/interface.zig
@@ -144,7 +144,7 @@ pub fn Interface(comptime T: type) type {
     assertDecl(T, "renderBundleEncoderDrawIndexed", fn (render_bundle_encoder: *gpu.RenderBundleEncoder, index_count: u32, instance_count: u32, first_index: u32, base_vertex: i32, first_instance: u32) callconv(.Inline) void);
     assertDecl(T, "renderBundleEncoderDrawIndexedIndirect", fn (render_bundle_encoder: *gpu.RenderBundleEncoder, indirect_buffer: *gpu.Buffer, indirect_offset: u64) callconv(.Inline) void);
     assertDecl(T, "renderBundleEncoderDrawIndirect", fn (render_bundle_encoder: *gpu.RenderBundleEncoder, indirect_buffer: *gpu.Buffer, indirect_offset: u64) callconv(.Inline) void);
-    assertDecl(T, "renderBundleEncoderFinish", fn (render_bundle_encoder: *gpu.RenderBundleEncoder, descriptor: ?*const gpu.RenderBundle.Descriptor) callconv(.Inline) void);
+    assertDecl(T, "renderBundleEncoderFinish", fn (render_bundle_encoder: *gpu.RenderBundleEncoder, descriptor: ?*const gpu.RenderBundle.Descriptor) callconv(.Inline) *gpu.RenderBundle);
     assertDecl(T, "renderBundleEncoderInsertDebugMarker", fn (render_bundle_encoder: *gpu.RenderBundleEncoder, marker_label: [*:0]const u8) callconv(.Inline) void);
     assertDecl(T, "renderBundleEncoderPopDebugGroup", fn (render_bundle_encoder: *gpu.RenderBundleEncoder) callconv(.Inline) void);
     assertDecl(T, "renderBundleEncoderPushDebugGroup", fn (render_bundle_encoder: *gpu.RenderBundleEncoder, group_label: [*:0]const u8) callconv(.Inline) void);
@@ -874,8 +874,8 @@ pub fn Export(comptime T: type) type {
         }
 
         // WGPU_EXPORT WGPURenderBundle wgpuRenderBundleEncoderFinish(WGPURenderBundleEncoder renderBundleEncoder, WGPURenderBundleDescriptor const * descriptor /* nullable */);
-        export fn wgpuRenderBundleEncoderFinish(render_bundle_encoder: *gpu.RenderBundleEncoder, descriptor: ?*const gpu.RenderBundle.Descriptor) void {
-            T.renderBundleEncoderFinish(render_bundle_encoder, descriptor);
+        export fn wgpuRenderBundleEncoderFinish(render_bundle_encoder: *gpu.RenderBundleEncoder, descriptor: ?*const gpu.RenderBundle.Descriptor) *gpu.RenderBundle {
+            return T.renderBundleEncoderFinish(render_bundle_encoder, descriptor);
         }
 
         // WGPU_EXPORT void wgpuRenderBundleEncoderInsertDebugMarker(WGPURenderBundleEncoder renderBundleEncoder, char const * markerLabel);
@@ -2018,7 +2018,7 @@ pub const StubInterface = Interface(struct {
         unreachable;
     }
 
-    pub inline fn renderBundleEncoderFinish(render_bundle_encoder: *gpu.RenderBundleEncoder, descriptor: ?*const gpu.RenderBundle.Descriptor) void {
+    pub inline fn renderBundleEncoderFinish(render_bundle_encoder: *gpu.RenderBundleEncoder, descriptor: ?*const gpu.RenderBundle.Descriptor) *gpu.RenderBundle {
         _ = render_bundle_encoder;
         _ = descriptor;
         unreachable;
diff --git a/gpu/src/render_bundle_encoder.zig b/gpu/src/render_bundle_encoder.zig
index d7c2c3f6..5c857025 100644
--- a/gpu/src/render_bundle_encoder.zig
+++ b/gpu/src/render_bundle_encoder.zig
@@ -43,8 +43,8 @@ pub const RenderBundleEncoder = opaque {
         Impl.renderBundleEncoderDrawIndirect(render_bundle_encoder, indirect_buffer, indirect_offset);
     }
 
-    pub inline fn finish(render_bundle_encoder: *RenderBundleEncoder, descriptor: ?*const RenderBundle.Descriptor) void {
-        Impl.renderBundleEncoderFinish(render_bundle_encoder, descriptor);
+    pub inline fn finish(render_bundle_encoder: *RenderBundleEncoder, descriptor: ?*const RenderBundle.Descriptor) *RenderBundle {
+        return Impl.renderBundleEncoderFinish(render_bundle_encoder, descriptor);
     }
 
     pub inline fn insertDebugMarker(render_bundle_encoder: *RenderBundleEncoder, marker_label: [*:0]const u8) void {