From 0372525c91721a6d6e23b92833d05e2be266b7f1 Mon Sep 17 00:00:00 2001 From: Stephen Gutekanst Date: Fri, 29 Jul 2022 22:47:37 -0700 Subject: [PATCH] gpu: convert *opaque -> opaque for RenderBundleEncoder Signed-off-by: Stephen Gutekanst --- gpu/src/device.zig | 2 +- gpu/src/interface.zig | 4 ++-- gpu/src/render_bundle_encoder.zig | 32 +++++++++++++++---------------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/gpu/src/device.zig b/gpu/src/device.zig index bcf1edc8..65160240 100644 --- a/gpu/src/device.zig +++ b/gpu/src/device.zig @@ -85,7 +85,7 @@ pub const Device = opaque { return Impl.deviceCreateQuerySet(device, descriptor); } - pub inline fn createRenderBundleEncoder(device: *Device, descriptor: *const RenderBundleEncoderDescriptor) RenderBundleEncoder { + pub inline fn createRenderBundleEncoder(device: *Device, descriptor: *const RenderBundleEncoderDescriptor) *RenderBundleEncoder { return Impl.deviceCreateRenderBundleEncoder(device, descriptor); } diff --git a/gpu/src/interface.zig b/gpu/src/interface.zig index a39d0a4d..bf2d0671 100644 --- a/gpu/src/interface.zig +++ b/gpu/src/interface.zig @@ -606,7 +606,7 @@ pub fn Export(comptime T: type) type { } // WGPU_EXPORT WGPURenderBundleEncoder wgpuDeviceCreateRenderBundleEncoder(WGPUDevice device, WGPURenderBundleEncoderDescriptor const * descriptor); - export fn wgpuDeviceCreateRenderBundleEncoder(device: *gpu.Device, descriptor: *const gpu.RenderBundleEncoderDescriptor) gpu.RenderBundleEncoder { + export fn wgpuDeviceCreateRenderBundleEncoder(device: *gpu.Device, descriptor: *const gpu.RenderBundleEncoderDescriptor) *gpu.RenderBundleEncoder { return T.deviceCreateRenderBundleEncoder(device, descriptor); } @@ -1685,7 +1685,7 @@ pub const StubInterface = Interface(struct { unreachable; } - pub inline fn deviceCreateRenderBundleEncoder(device: *gpu.Device, descriptor: *const gpu.RenderBundleEncoderDescriptor) gpu.RenderBundleEncoder { + pub inline fn deviceCreateRenderBundleEncoder(device: *gpu.Device, descriptor: *const gpu.RenderBundleEncoderDescriptor) *gpu.RenderBundleEncoder { _ = device; _ = descriptor; unreachable; diff --git a/gpu/src/render_bundle_encoder.zig b/gpu/src/render_bundle_encoder.zig index d209ad63..0e3dcaff 100644 --- a/gpu/src/render_bundle_encoder.zig +++ b/gpu/src/render_bundle_encoder.zig @@ -8,11 +8,11 @@ const ChainedStruct = @import("types.zig").ChainedStruct; const IndexFormat = @import("types.zig").IndexFormat; const Impl = @import("interface.zig").Impl; -pub const RenderBundleEncoder = *opaque { +pub const RenderBundleEncoder = opaque { /// Default `instance_count`: 1 /// Default `first_vertex`: 0 /// Default `first_instance`: 0 - pub inline fn draw(render_bundle_encoder: RenderBundleEncoder, vertex_count: u32, instance_count: u32, first_vertex: u32, first_instance: u32) void { + pub inline fn draw(render_bundle_encoder: *RenderBundleEncoder, vertex_count: u32, instance_count: u32, first_vertex: u32, first_instance: u32) void { Impl.renderBundleEncoderDraw(render_bundle_encoder, vertex_count, instance_count, first_vertex, first_instance); } @@ -20,65 +20,65 @@ pub const RenderBundleEncoder = *opaque { /// Default `first_index`: 0 /// Default `base_vertex`: 0 /// Default `first_instance`: 0 - pub inline fn drawIndexed(render_bundle_encoder: RenderBundleEncoder, index_count: u32, instance_count: u32, first_index: u32, base_vertex: u32, first_instance: u32) void { + pub inline fn drawIndexed(render_bundle_encoder: *RenderBundleEncoder, index_count: u32, instance_count: u32, first_index: u32, base_vertex: u32, first_instance: u32) void { Impl.renderBundleEncoderDrawIndexed(render_bundle_encoder, index_count, instance_count, first_index, base_vertex, first_instance); } - pub inline fn drawIndexedIndirect(render_bundle_encoder: RenderBundleEncoder, indirect_buffer: *Buffer, indirect_offset: u64) void { + pub inline fn drawIndexedIndirect(render_bundle_encoder: *RenderBundleEncoder, indirect_buffer: *Buffer, indirect_offset: u64) void { Impl.renderBundleEncoderDrawIndexedIndirect(render_bundle_encoder, indirect_buffer, indirect_offset); } - pub inline fn drawIndirect(render_bundle_encoder: RenderBundleEncoder, indirect_buffer: *Buffer, indirect_offset: u64) void { + pub inline fn drawIndirect(render_bundle_encoder: *RenderBundleEncoder, indirect_buffer: *Buffer, indirect_offset: u64) void { Impl.renderBundleEncoderDrawIndirect(render_bundle_encoder, indirect_buffer, indirect_offset); } - pub inline fn finish(render_bundle_encoder: RenderBundleEncoder, descriptor: ?*const RenderBundleDescriptor) void { + pub inline fn finish(render_bundle_encoder: *RenderBundleEncoder, descriptor: ?*const RenderBundleDescriptor) void { Impl.renderBundleEncoderFinish(render_bundle_encoder, descriptor); } - pub inline fn insertDebugMarker(render_bundle_encoder: RenderBundleEncoder, marker_label: [*:0]const u8) void { + pub inline fn insertDebugMarker(render_bundle_encoder: *RenderBundleEncoder, marker_label: [*:0]const u8) void { Impl.renderBundleEncoderInsertDebugMarker(render_bundle_encoder, marker_label); } - pub inline fn popDebugGroup(render_bundle_encoder: RenderBundleEncoder) void { + pub inline fn popDebugGroup(render_bundle_encoder: *RenderBundleEncoder) void { Impl.renderBundleEncoderPopDebugGroup(render_bundle_encoder); } - pub inline fn pushDebugGroup(render_bundle_encoder: RenderBundleEncoder, group_label: [*:0]const u8) void { + pub inline fn pushDebugGroup(render_bundle_encoder: *RenderBundleEncoder, group_label: [*:0]const u8) void { Impl.renderBundleEncoderPushDebugGroup(render_bundle_encoder, group_label); } /// Default `dynamic_offsets_count`: 0 /// Default `dynamic_offsets`: `null` - pub inline fn setBindGroup(render_bundle_encoder: RenderBundleEncoder, group_index: u32, group: *BindGroup, dynamic_offset_count: u32, dynamic_offsets: ?[*]const u32) void { + pub inline fn setBindGroup(render_bundle_encoder: *RenderBundleEncoder, group_index: u32, group: *BindGroup, dynamic_offset_count: u32, dynamic_offsets: ?[*]const u32) void { Impl.renderBundleEncoderSetBindGroup(render_bundle_encoder, group_index, group, dynamic_offset_count, dynamic_offsets); } /// Default `offset`: 0 /// Default `size`: `gpu.whole_size` - pub inline fn setIndexBuffer(render_bundle_encoder: RenderBundleEncoder, buffer: *Buffer, format: IndexFormat, offset: u64, size: u64) void { + pub inline fn setIndexBuffer(render_bundle_encoder: *RenderBundleEncoder, buffer: *Buffer, format: IndexFormat, offset: u64, size: u64) void { Impl.renderBundleEncoderSetIndexBuffer(render_bundle_encoder, buffer, format, offset, size); } - pub inline fn setLabel(render_bundle_encoder: RenderBundleEncoder, label: [*:0]const u8) void { + pub inline fn setLabel(render_bundle_encoder: *RenderBundleEncoder, label: [*:0]const u8) void { Impl.renderBundleEncoderSetLabel(render_bundle_encoder, label); } - pub inline fn setPipeline(render_bundle_encoder: RenderBundleEncoder, pipeline: RenderPipeline) void { + pub inline fn setPipeline(render_bundle_encoder: *RenderBundleEncoder, pipeline: RenderPipeline) void { Impl.renderBundleEncoderSetPipeline(render_bundle_encoder, pipeline); } /// Default `offset`: 0 /// Default `size`: `gpu.whole_size` - pub inline fn setVertexBuffer(render_bundle_encoder: RenderBundleEncoder, slot: u32, buffer: *Buffer, offset: u64, size: u64) void { + pub inline fn setVertexBuffer(render_bundle_encoder: *RenderBundleEncoder, slot: u32, buffer: *Buffer, offset: u64, size: u64) void { Impl.renderBundleEncoderSetVertexBuffer(render_bundle_encoder, slot, buffer, offset, size); } - pub inline fn reference(render_bundle_encoder: RenderBundleEncoder) void { + pub inline fn reference(render_bundle_encoder: *RenderBundleEncoder) void { Impl.renderBundleEncoderReference(render_bundle_encoder); } - pub inline fn release(render_bundle_encoder: RenderBundleEncoder) void { + pub inline fn release(render_bundle_encoder: *RenderBundleEncoder) void { Impl.renderBundleEncoderRelease(render_bundle_encoder); } };