From 660a0334ddeefe360c9f07c2f1da3e85eca66c2b Mon Sep 17 00:00:00 2001 From: Stephen Gutekanst Date: Tue, 15 Mar 2022 21:40:32 -0700 Subject: [PATCH] gpu: implement RenderPassEncoder.drawIndexed Signed-off-by: Stephen Gutekanst --- gpu/src/NativeInstance.zig | 19 +++++++++++++++++++ gpu/src/RenderPassEncoder.zig | 20 +++++++++++++++++++- 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/gpu/src/NativeInstance.zig b/gpu/src/NativeInstance.zig index d4075540..a8f26ec6 100644 --- a/gpu/src/NativeInstance.zig +++ b/gpu/src/NativeInstance.zig @@ -903,6 +903,25 @@ const render_pass_encoder_vtable = RenderPassEncoder.VTable{ c.wgpuRenderPassEncoderDraw(@ptrCast(c.WGPURenderPassEncoder, ptr), vertex_count, instance_count, first_vertex, first_instance); } }).draw, + .drawIndexed = (struct { + pub fn drawIndexed( + ptr: *anyopaque, + index_count: u32, + instance_count: u32, + first_index: u32, + base_vertex: i32, + first_instance: u32, + ) void { + c.wgpuRenderPassEncoderDrawIndexed( + @ptrCast(c.WGPURenderPassEncoder, ptr), + index_count, + instance_count, + first_index, + base_vertex, + first_instance, + ); + } + }).drawIndexed, .beginOcclusionQuery = (struct { pub fn beginOcclusionQuery(ptr: *anyopaque, query_index: u32) void { c.wgpuRenderPassEncoderBeginOcclusionQuery(@ptrCast(c.WGPURenderPassEncoder, ptr), query_index); diff --git a/gpu/src/RenderPassEncoder.zig b/gpu/src/RenderPassEncoder.zig index e6dca743..0478ed5b 100644 --- a/gpu/src/RenderPassEncoder.zig +++ b/gpu/src/RenderPassEncoder.zig @@ -16,7 +16,14 @@ pub const VTable = struct { release: fn (ptr: *anyopaque) void, beginOcclusionQuery: fn (ptr: *anyopaque, query_index: u32) void, draw: fn (ptr: *anyopaque, vertex_count: u32, instance_count: u32, first_vertex: u32, first_instance: u32) void, - // WGPU_EXPORT void wgpuRenderPassEncoderDrawIndexed(WGPURenderPassEncoder renderPassEncoder, uint32_t indexCount, uint32_t instanceCount, uint32_t firstIndex, int32_t baseVertex, uint32_t firstInstance); + drawIndexed: fn ( + ptr: *anyopaque, + index_count: u32, + instance_count: u32, + first_index: u32, + base_vertex: i32, + first_instance: u32, + ) void, // WGPU_EXPORT void wgpuRenderPassEncoderDrawIndexedIndirect(WGPURenderPassEncoder renderPassEncoder, WGPUBuffer indirectBuffer, uint64_t indirectOffset); // WGPU_EXPORT void wgpuRenderPassEncoderDrawIndirect(WGPURenderPassEncoder renderPassEncoder, WGPUBuffer indirectBuffer, uint64_t indirectOffset); end: fn (ptr: *anyopaque) void, @@ -57,6 +64,17 @@ pub inline fn draw( pass.vtable.draw(pass.ptr, vertex_count, instance_count, first_vertex, first_instance); } +pub inline fn drawIndexed( + pass: RenderPassEncoder, + index_count: u32, + instance_count: u32, + first_index: u32, + base_vertex: i32, + first_instance: u32, +) void { + pass.vtable.drawIndexed(pass.ptr, index_count, instance_count, first_index, base_vertex, first_instance); +} + pub inline fn beginOcclusionQuery(pass: RenderPassEncoder, query_index: u32) void { pass.vtable.beginOcclusionQuery(pass.ptr, query_index); }