From e8c50ad878c2c81a3a6fa6f82cff9dec218c96e1 Mon Sep 17 00:00:00 2001
From: Stephen Gutekanst <stephen@hexops.com>
Date: Wed, 16 Mar 2022 20:59:37 -0700
Subject: [PATCH] gpu: implement RenderBundleEncoder.drawIndexedIndirect

Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
---
 gpu/src/NativeInstance.zig      | 18 +++++++++---------
 gpu/src/RenderBundleEncoder.zig | 11 ++++++-----
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/gpu/src/NativeInstance.zig b/gpu/src/NativeInstance.zig
index 611c8e5f..752f8d37 100644
--- a/gpu/src/NativeInstance.zig
+++ b/gpu/src/NativeInstance.zig
@@ -1146,15 +1146,15 @@ const render_bundle_encoder_vtable = RenderBundleEncoder.VTable{
             );
         }
     }).drawIndexed,
-    // .drawIndexedIndirect = (struct {
-    //     pub fn drawIndexedIndirect(ptr: *anyopaque, indirect_buffer: Buffer, indirect_offset: u64) void {
-    //         c.wgpuRenderBundleEncoderDrawIndexedIndirect(
-    //             @ptrCast(c.WGPURenderBundleEncoder, ptr),
-    //             @ptrCast(c.WGPUBuffer, indirect_buffer.ptr),
-    //             indirect_offset,
-    //         );
-    //     }
-    // }).drawIndexedIndirect,
+    .drawIndexedIndirect = (struct {
+        pub fn drawIndexedIndirect(ptr: *anyopaque, indirect_buffer: Buffer, indirect_offset: u64) void {
+            c.wgpuRenderBundleEncoderDrawIndexedIndirect(
+                @ptrCast(c.WGPURenderBundleEncoder, ptr),
+                @ptrCast(c.WGPUBuffer, indirect_buffer.ptr),
+                indirect_offset,
+            );
+        }
+    }).drawIndexedIndirect,
     // .drawIndirect = (struct {
     //     pub fn drawIndirect(ptr: *anyopaque, indirect_buffer: Buffer, indirect_offset: u64) void {
     //         c.wgpuRenderBundleEncoderDrawIndexedIndirect(
diff --git a/gpu/src/RenderBundleEncoder.zig b/gpu/src/RenderBundleEncoder.zig
index f2cce249..47f069ce 100644
--- a/gpu/src/RenderBundleEncoder.zig
+++ b/gpu/src/RenderBundleEncoder.zig
@@ -1,4 +1,5 @@
 const Texture = @import("Texture.zig");
+const Buffer = @import("Buffer.zig");
 
 const RenderBundleEncoder = @This();
 
@@ -25,8 +26,7 @@ pub const VTable = struct {
         base_vertex: i32,
         first_instance: u32,
     ) void,
-    // drawIndexedIndirect: fn (ptr: *anyopaque, indirect_buffer: Buffer, indirect_offset: u64) void,
-    // WGPU_EXPORT void wgpuRenderBundleEncoderDrawIndexedIndirect(WGPURenderBundleEncoder renderBundleEncoder, WGPUBuffer indirectBuffer, uint64_t indirectOffset);
+    drawIndexedIndirect: fn (ptr: *anyopaque, indirect_buffer: Buffer, indirect_offset: u64) void,
     // drawIndirect: fn (ptr: *anyopaque, indirect_buffer: Buffer, indirect_offset: u64) void,
     // WGPU_EXPORT void wgpuRenderBundleEncoderDrawIndirect(WGPURenderBundleEncoder renderBundleEncoder, WGPUBuffer indirectBuffer, uint64_t indirectOffset);
     // finish: fn (ptr: *anyopaque, descriptor: *const RenderBundle.Descriptor) void,
@@ -77,9 +77,9 @@ pub inline fn drawIndexed(
     enc.vtable.drawIndexed(enc.ptr, index_count, instance_count, first_index, base_vertex, first_instance);
 }
 
-// pub inline fn drawIndexedIndirect(enc: RenderBundleEncoder, indirect_buffer: Buffer, indirect_offset: u64) void {
-//     enc.vtable.drawIndexedIndirect(enc.ptr, indirect_buffer, indirect_offset);
-// }
+pub inline fn drawIndexedIndirect(enc: RenderBundleEncoder, indirect_buffer: Buffer, indirect_offset: u64) void {
+    enc.vtable.drawIndexedIndirect(enc.ptr, indirect_buffer, indirect_offset);
+}
 
 // pub inline fn drawIndirect(enc: RenderBundleEncoder, indirect_buffer: Buffer, indirect_offset: u64) void {
 //     enc.vtable.drawIndirect(enc.ptr, indirect_buffer, indirect_offset);
@@ -193,5 +193,6 @@ test {
     _ = release;
     _ = draw;
     _ = drawIndexed;
+    _ = drawIndexedIndirect;
     _ = Descriptor;
 }