From c75d1d9e0660fa4b3e47a2e85bb6a51e262febcb Mon Sep 17 00:00:00 2001 From: Stephen Gutekanst Date: Fri, 29 Jul 2022 22:44:53 -0700 Subject: [PATCH] gpu: convert *opaque -> opaque for QuerySet Signed-off-by: Stephen Gutekanst --- gpu/src/command_encoder.zig | 4 ++-- gpu/src/device.zig | 2 +- gpu/src/interface.zig | 4 ++-- gpu/src/query_set.zig | 14 +++++++------- gpu/src/render_pass_encoder.zig | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/gpu/src/command_encoder.zig b/gpu/src/command_encoder.zig index f52a1515..f678f09e 100644 --- a/gpu/src/command_encoder.zig +++ b/gpu/src/command_encoder.zig @@ -69,7 +69,7 @@ pub const CommandEncoder = opaque { Impl.commandEncoderPushDebugGroup(command_encoder, group_label); } - pub inline fn resolveQuerySet(command_encoder: *CommandEncoder, query_set: QuerySet, first_query: u32, query_count: u32, destination: *Buffer, destination_offset: u64) void { + pub inline fn resolveQuerySet(command_encoder: *CommandEncoder, query_set: *QuerySet, first_query: u32, query_count: u32, destination: *Buffer, destination_offset: u64) void { Impl.commandEncoderResolveQuerySet(command_encoder, query_set, first_query, query_count, destination, destination_offset); } @@ -81,7 +81,7 @@ pub const CommandEncoder = opaque { Impl.commandEncoderWriteBuffer(command_encoder, buffer, buffer_offset, data, size); } - pub inline fn writeTimestamp(command_encoder: *CommandEncoder, query_set: QuerySet, query_index: u32) void { + pub inline fn writeTimestamp(command_encoder: *CommandEncoder, query_set: *QuerySet, query_index: u32) void { Impl.commandEncoderWriteTimestamp(command_encoder, query_set, query_index); } diff --git a/gpu/src/device.zig b/gpu/src/device.zig index a7124515..5151cff8 100644 --- a/gpu/src/device.zig +++ b/gpu/src/device.zig @@ -81,7 +81,7 @@ pub const Device = opaque { return Impl.deviceCreatePipelineLayout(device, pipeline_layout_descriptor); } - pub inline fn createQuerySet(device: *Device, descriptor: *const QuerySetDescriptor) QuerySet { + pub inline fn createQuerySet(device: *Device, descriptor: *const QuerySetDescriptor) *QuerySet { return Impl.deviceCreateQuerySet(device, descriptor); } diff --git a/gpu/src/interface.zig b/gpu/src/interface.zig index fa7b632d..e221d0fa 100644 --- a/gpu/src/interface.zig +++ b/gpu/src/interface.zig @@ -601,7 +601,7 @@ pub fn Export(comptime T: type) type { } // WGPU_EXPORT WGPUQuerySet wgpuDeviceCreateQuerySet(WGPUDevice device, WGPUQuerySetDescriptor const * descriptor); - export fn wgpuDeviceCreateQuerySet(device: *gpu.Device, descriptor: *const gpu.QuerySetDescriptor) gpu.QuerySet { + export fn wgpuDeviceCreateQuerySet(device: *gpu.Device, descriptor: *const gpu.QuerySetDescriptor) *gpu.QuerySet { return T.deviceCreateQuerySet(device, descriptor); } @@ -1679,7 +1679,7 @@ pub const StubInterface = Interface(struct { unreachable; } - pub inline fn deviceCreateQuerySet(device: *gpu.Device, descriptor: *const gpu.QuerySetDescriptor) gpu.QuerySet { + pub inline fn deviceCreateQuerySet(device: *gpu.Device, descriptor: *const gpu.QuerySetDescriptor) *gpu.QuerySet { _ = device; _ = descriptor; unreachable; diff --git a/gpu/src/query_set.zig b/gpu/src/query_set.zig index a026dabb..dbab843c 100644 --- a/gpu/src/query_set.zig +++ b/gpu/src/query_set.zig @@ -3,28 +3,28 @@ const PipelineStatisticName = @import("types.zig").PipelineStatisticName; const QueryType = @import("types.zig").QueryType; const Impl = @import("interface.zig").Impl; -pub const QuerySet = *opaque { - pub inline fn destroy(query_set: QuerySet) void { +pub const QuerySet = opaque { + pub inline fn destroy(query_set: *QuerySet) void { Impl.querySetDestroy(query_set); } - pub inline fn getCount(query_set: QuerySet) u32 { + pub inline fn getCount(query_set: *QuerySet) u32 { return Impl.querySetGetCount(query_set); } - pub inline fn getType(query_set: QuerySet) QueryType { + pub inline fn getType(query_set: *QuerySet) QueryType { return Impl.querySetGetType(query_set); } - pub inline fn setLabel(query_set: QuerySet, label: [*:0]const u8) void { + pub inline fn setLabel(query_set: *QuerySet, label: [*:0]const u8) void { Impl.querySetSetLabel(query_set, label); } - pub inline fn reference(query_set: QuerySet) void { + pub inline fn reference(query_set: *QuerySet) void { Impl.querySetReference(query_set); } - pub inline fn release(query_set: QuerySet) void { + pub inline fn release(query_set: *QuerySet) void { Impl.querySetRelease(query_set); } }; diff --git a/gpu/src/render_pass_encoder.zig b/gpu/src/render_pass_encoder.zig index d3b6284c..500bdc1b 100644 --- a/gpu/src/render_pass_encoder.zig +++ b/gpu/src/render_pass_encoder.zig @@ -101,7 +101,7 @@ pub const RenderPassEncoder = *opaque { 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); }