From 508ba37e7e4c0fa6a9abcc195863b64416ab5d06 Mon Sep 17 00:00:00 2001 From: Stephen Gutekanst Date: Fri, 29 Jul 2022 22:57:43 -0700 Subject: [PATCH] gpu: convert *opaque -> opaque for RenderPassEncoder Signed-off-by: Stephen Gutekanst --- gpu/src/command_encoder.zig | 2 +- gpu/src/render_pass_encoder.zig | 46 ++++++++++++++++----------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/gpu/src/command_encoder.zig b/gpu/src/command_encoder.zig index f678f09e..a06f1b50 100644 --- a/gpu/src/command_encoder.zig +++ b/gpu/src/command_encoder.zig @@ -17,7 +17,7 @@ pub const CommandEncoder = opaque { return Impl.commandEncoderBeginComputePass(command_encoder, descriptor); } - pub inline fn beginRenderPass(command_encoder: *CommandEncoder, descriptor: *const RenderPassDescriptor) RenderPassEncoder { + pub inline fn beginRenderPass(command_encoder: *CommandEncoder, descriptor: *const RenderPassDescriptor) *RenderPassEncoder { return Impl.commandEncoderBeginRenderPass(command_encoder, descriptor); } diff --git a/gpu/src/render_pass_encoder.zig b/gpu/src/render_pass_encoder.zig index 500bdc1b..ee78778c 100644 --- a/gpu/src/render_pass_encoder.zig +++ b/gpu/src/render_pass_encoder.zig @@ -8,14 +8,14 @@ const IndexFormat = @import("types.zig").IndexFormat; const Impl = @import("interface.zig").Impl; pub const RenderPassEncoder = *opaque { - pub inline fn beginOcclusionQuery(render_pass_encoder: RenderPassEncoder, query_index: u32) void { + pub inline fn beginOcclusionQuery(render_pass_encoder: *RenderPassEncoder, query_index: u32) void { Impl.renderPassEncoderBeginOcclusionQuery(render_pass_encoder, query_index); } /// Default `instance_count`: 1 /// Default `first_vertex`: 0 /// Default `first_instance`: 0 - pub inline fn draw(render_pass_encoder: RenderPassEncoder, vertex_count: u32, instance_count: u32, first_vertex: u32, first_instance: u32) void { + pub inline fn draw(render_pass_encoder: *RenderPassEncoder, vertex_count: u32, instance_count: u32, first_vertex: u32, first_instance: u32) void { Impl.renderPassEncoderDraw(render_pass_encoder, vertex_count, instance_count, first_vertex, first_instance); } @@ -23,93 +23,93 @@ pub const RenderPassEncoder = *opaque { /// Default `first_index`: 0 /// Default `base_vertex`: 0 /// Default `first_instance`: 0 - pub inline fn drawIndexed(render_pass_encoder: RenderPassEncoder, index_count: u32, instance_count: u32, first_index: u32, base_vertex: u32, first_instance: u32) void { + pub inline fn drawIndexed(render_pass_encoder: *RenderPassEncoder, index_count: u32, instance_count: u32, first_index: u32, base_vertex: u32, first_instance: u32) void { Impl.renderPassEncoderDrawIndexed(render_pass_encoder, index_count, instance_count, first_index, base_vertex, first_instance); } - pub inline fn drawIndexedIndirect(render_pass_encoder: RenderPassEncoder, indirect_buffer: *Buffer, indirect_offset: u64) void { + pub inline fn drawIndexedIndirect(render_pass_encoder: *RenderPassEncoder, indirect_buffer: *Buffer, indirect_offset: u64) void { Impl.renderPassEncoderDrawIndexedIndirect(render_pass_encoder, indirect_buffer, indirect_offset); } - pub inline fn drawIndirect(render_pass_encoder: RenderPassEncoder, indirect_buffer: *Buffer, indirect_offset: u64) void { + pub inline fn drawIndirect(render_pass_encoder: *RenderPassEncoder, indirect_buffer: *Buffer, indirect_offset: u64) void { Impl.renderPassEncoderDrawIndirect(render_pass_encoder, indirect_buffer, indirect_offset); } - pub inline fn end(render_pass_encoder: RenderPassEncoder) void { + pub inline fn end(render_pass_encoder: *RenderPassEncoder) void { Impl.renderPassEncoderEnd(render_pass_encoder); } - pub inline fn endOcclusionQuery(render_pass_encoder: RenderPassEncoder) void { + pub inline fn endOcclusionQuery(render_pass_encoder: *RenderPassEncoder) void { Impl.renderPassEncoderEndOcclusionQuery(render_pass_encoder); } - pub inline fn executeBundles(render_pass_encoder: RenderPassEncoder, bundles_count: u32, bundles: [*]const RenderBundle) void { + pub inline fn executeBundles(render_pass_encoder: *RenderPassEncoder, bundles_count: u32, bundles: [*]const RenderBundle) void { Impl.renderPassEncoderExecuteBundles(render_pass_encoder, bundles_count, bundles); } - pub inline fn insertDebugMarker(render_pass_encoder: RenderPassEncoder, marker_label: [*:0]const u8) void { + pub inline fn insertDebugMarker(render_pass_encoder: *RenderPassEncoder, marker_label: [*:0]const u8) void { Impl.renderPassEncoderInsertDebugMarker(render_pass_encoder, marker_label); } - pub inline fn popDebugGroup(render_pass_encoder: RenderPassEncoder) void { + pub inline fn popDebugGroup(render_pass_encoder: *RenderPassEncoder) void { Impl.renderPassEncoderPopDebugGroup(render_pass_encoder); } - pub inline fn pushDebugGroup(render_pass_encoder: RenderPassEncoder, group_label: [*:0]const u8) void { + pub inline fn pushDebugGroup(render_pass_encoder: *RenderPassEncoder, group_label: [*:0]const u8) void { Impl.renderPassEncoderPushDebugGroup(render_pass_encoder, group_label); } /// Default `dynamic_offsets_count`: 0 /// Default `dynamic_offsets`: `null` - pub inline fn setBindGroup(render_pass_encoder: RenderPassEncoder, group_index: u32, group: *BindGroup, dynamic_offset_count: u32, dynamic_offsets: ?[*]const u32) void { + pub inline fn setBindGroup(render_pass_encoder: *RenderPassEncoder, group_index: u32, group: *BindGroup, dynamic_offset_count: u32, dynamic_offsets: ?[*]const u32) void { Impl.renderPassEncoderSetBindGroup(render_pass_encoder, group_index, group, dynamic_offset_count, dynamic_offsets); } - pub inline fn setBlendConstant(render_pass_encoder: RenderPassEncoder, color: *const Color) void { + pub inline fn setBlendConstant(render_pass_encoder: *RenderPassEncoder, color: *const Color) void { Impl.renderPassEncoderSetBlendConstant(render_pass_encoder, color); } /// Default `offset`: 0 /// Default `size`: `gpu.whole_size` - pub inline fn setIndexBuffer(render_pass_encoder: RenderPassEncoder, buffer: *Buffer, format: IndexFormat, offset: u64, size: u64) void { + pub inline fn setIndexBuffer(render_pass_encoder: *RenderPassEncoder, buffer: *Buffer, format: IndexFormat, offset: u64, size: u64) void { Impl.renderPassEncoderSetIndexBuffer(render_pass_encoder, buffer, format, offset, size); } - pub inline fn setLabel(render_pass_encoder: RenderPassEncoder, label: [*:0]const u8) void { + pub inline fn setLabel(render_pass_encoder: *RenderPassEncoder, label: [*:0]const u8) void { Impl.renderPassEncoderSetLabel(render_pass_encoder, label); } - pub inline fn setPipeline(render_pass_encoder: RenderPassEncoder, pipeline: RenderPipeline) void { + pub inline fn setPipeline(render_pass_encoder: *RenderPassEncoder, pipeline: RenderPipeline) void { Impl.renderPassEncoderSetPipeline(render_pass_encoder, pipeline); } - pub inline fn setScissorRect(render_pass_encoder: RenderPassEncoder, x: u32, y: u32, width: u32, height: u32) void { + pub inline fn setScissorRect(render_pass_encoder: *RenderPassEncoder, x: u32, y: u32, width: u32, height: u32) void { Impl.renderPassEncoderSetScissorRect(render_pass_encoder, x, y, width, height); } - pub inline fn setStencilReference(render_pass_encoder: RenderPassEncoder, _reference: u32) void { + pub inline fn setStencilReference(render_pass_encoder: *RenderPassEncoder, _reference: u32) void { Impl.renderPassEncoderSetStencilReference(render_pass_encoder, _reference); } /// Default `offset`: 0 /// Default `size`: `gpu.whole_size` - pub inline fn setVertexBuffer(render_pass_encoder: RenderPassEncoder, slot: u32, buffer: *Buffer, offset: u64, size: u64) void { + pub inline fn setVertexBuffer(render_pass_encoder: *RenderPassEncoder, slot: u32, buffer: *Buffer, offset: u64, size: u64) void { Impl.renderPassEncoderSetVertexBuffer(render_pass_encoder, slot, buffer, offset, size); } - pub inline fn setViewport(render_pass_encoder: RenderPassEncoder, x: f32, y: f32, width: f32, height: f32, min_depth: f32, max_depth: f32) void { + pub inline fn setViewport(render_pass_encoder: *RenderPassEncoder, x: f32, y: f32, width: f32, height: f32, min_depth: f32, max_depth: f32) void { Impl.renderPassEncoderSetViewport(render_pass_encoder, x, y, width, height, min_depth, max_depth); } - pub inline fn writeTimestamp(render_pass_encoder: RenderPassEncoder, query_set: *QuerySet, query_index: u32) void { + pub inline fn writeTimestamp(render_pass_encoder: *RenderPassEncoder, query_set: *QuerySet, query_index: u32) void { Impl.renderPassEncoderWriteTimestamp(render_pass_encoder, query_set, query_index); } - pub inline fn reference(render_pass_encoder: RenderPassEncoder) void { + pub inline fn reference(render_pass_encoder: *RenderPassEncoder) void { Impl.renderPassEncoderReference(render_pass_encoder); } - pub inline fn release(render_pass_encoder: RenderPassEncoder) void { + pub inline fn release(render_pass_encoder: *RenderPassEncoder) void { Impl.renderPassEncoderRelease(render_pass_encoder); } };