From e15cb4009a8d2847ac8c65524e02e5c0aa265809 Mon Sep 17 00:00:00 2001 From: Stephen Gutekanst Date: Fri, 29 Jul 2022 22:28:18 -0700 Subject: [PATCH] gpu: convert *opaque -> opaque for CommandBuffer Signed-off-by: Stephen Gutekanst --- gpu/src/command_buffer.zig | 8 ++++---- gpu/src/command_encoder.zig | 2 +- gpu/src/interface.zig | 10 +++++----- gpu/src/queue.zig | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/gpu/src/command_buffer.zig b/gpu/src/command_buffer.zig index afe008a5..ccdf1f6c 100644 --- a/gpu/src/command_buffer.zig +++ b/gpu/src/command_buffer.zig @@ -1,16 +1,16 @@ const ChainedStruct = @import("types.zig").ChainedStruct; const Impl = @import("interface.zig").Impl; -pub const CommandBuffer = *opaque { - pub inline fn setLabel(command_buffer: CommandBuffer, label: [*:0]const u8) void { +pub const CommandBuffer = opaque { + pub inline fn setLabel(command_buffer: *CommandBuffer, label: [*:0]const u8) void { Impl.commandBufferSetLabel(command_buffer, label); } - pub inline fn reference(command_buffer: CommandBuffer) void { + pub inline fn reference(command_buffer: *CommandBuffer) void { Impl.commandBufferReference(command_buffer); } - pub inline fn release(command_buffer: CommandBuffer) void { + pub inline fn release(command_buffer: *CommandBuffer) void { Impl.commandBufferRelease(command_buffer); } }; diff --git a/gpu/src/command_encoder.zig b/gpu/src/command_encoder.zig index 112a10ec..8d46a1c0 100644 --- a/gpu/src/command_encoder.zig +++ b/gpu/src/command_encoder.zig @@ -49,7 +49,7 @@ pub const CommandEncoder = *opaque { Impl.commandEncoderCopyTextureToTextureInternal(command_encoder, source, destination, copy_size); } - pub inline fn finish(command_encoder: CommandEncoder, descriptor: ?*const CommandBufferDescriptor) CommandBuffer { + pub inline fn finish(command_encoder: CommandEncoder, descriptor: ?*const CommandBufferDescriptor) *CommandBuffer { return Impl.commandEncoderFinish(command_encoder, descriptor); } diff --git a/gpu/src/interface.zig b/gpu/src/interface.zig index d5890fad..122ecc4e 100644 --- a/gpu/src/interface.zig +++ b/gpu/src/interface.zig @@ -135,7 +135,7 @@ pub fn Interface(comptime T: type) type { assertDecl(T, "queueCopyTextureForBrowser", fn (queue: *gpu.Queue, source: *const gpu.ImageCopyTexture, destination: *const gpu.ImageCopyTexture, copy_size: *const gpu.Extent3D, options: *const gpu.CopyTextureForBrowserOptions) callconv(.Inline) void); assertDecl(T, "queueOnSubmittedWorkDone", fn (queue: *gpu.Queue, signal_value: u64, callback: gpu.QueueWorkDoneCallback, userdata: *anyopaque) callconv(.Inline) void); assertDecl(T, "queueSetLabel", fn (queue: *gpu.Queue, label: [*:0]const u8) callconv(.Inline) void); - assertDecl(T, "queueSubmit", fn (queue: *gpu.Queue, command_count: u32, commands: [*]gpu.CommandBuffer) callconv(.Inline) void); + assertDecl(T, "queueSubmit", fn (queue: *gpu.Queue, command_count: u32, commands: [*]*gpu.CommandBuffer) callconv(.Inline) void); assertDecl(T, "queueWriteBuffer", fn (queue: *gpu.Queue, buffer: *gpu.Buffer, buffer_offset: u64, data: *anyopaque, size: usize) callconv(.Inline) void); assertDecl(T, "queueWriteTexture", fn (queue: *gpu.Queue, data: *anyopaque, data_size: usize, data_layout: *const gpu.TextureDataLayout, write_size: *const gpu.Extent3D) callconv(.Inline) void); assertDecl(T, "queueReference", fn (queue: *gpu.Queue) callconv(.Inline) void); @@ -416,7 +416,7 @@ pub fn Export(comptime T: type) type { } // WGPU_EXPORT WGPUCommandBuffer wgpuCommandEncoderFinish(WGPUCommandEncoder commandEncoder, WGPUCommandBufferDescriptor const * descriptor /* nullable */); - export fn wgpuCommandEncoderFinish(command_encoder: *gpu.CommandEncoder, descriptor: ?*const gpu.CommandBufferDescriptor) gpu.CommandBuffer { + export fn wgpuCommandEncoderFinish(command_encoder: *gpu.CommandEncoder, descriptor: ?*const gpu.CommandBufferDescriptor) *gpu.CommandBuffer { return T.commandEncoderFinish(command_encoder, descriptor); } @@ -821,7 +821,7 @@ pub fn Export(comptime T: type) type { } // WGPU_EXPORT void wgpuQueueSubmit(WGPUQueue queue, uint32_t commandCount, WGPUCommandBuffer const * commands); - export fn wgpuQueueSubmit(queue: *gpu.Queue, command_count: u32, commands: [*]gpu.CommandBuffer) void { + export fn wgpuQueueSubmit(queue: *gpu.Queue, command_count: u32, commands: [*]*gpu.CommandBuffer) void { T.queueSubmit(queue, command_count, commands); } @@ -1452,7 +1452,7 @@ pub const StubInterface = Interface(struct { unreachable; } - pub inline fn commandEncoderFinish(command_encoder: *gpu.CommandEncoder, descriptor: ?*const gpu.CommandBufferDescriptor) gpu.CommandBuffer { + pub inline fn commandEncoderFinish(command_encoder: *gpu.CommandEncoder, descriptor: ?*const gpu.CommandBufferDescriptor) *gpu.CommandBuffer { _ = command_encoder; _ = descriptor; unreachable; @@ -1940,7 +1940,7 @@ pub const StubInterface = Interface(struct { unreachable; } - pub inline fn queueSubmit(queue: *gpu.Queue, command_count: u32, commands: [*]gpu.CommandBuffer) void { + pub inline fn queueSubmit(queue: *gpu.Queue, command_count: u32, commands: [*]*gpu.CommandBuffer) void { _ = queue; _ = command_count; _ = commands; diff --git a/gpu/src/queue.zig b/gpu/src/queue.zig index 7bc8788e..ead2b706 100644 --- a/gpu/src/queue.zig +++ b/gpu/src/queue.zig @@ -20,7 +20,7 @@ pub const Queue = *opaque { Impl.queueSetLabel(queue, label); } - pub inline fn submit(queue: Queue, command_count: u32, commands: [*]CommandBuffer) void { + pub inline fn submit(queue: Queue, command_count: u32, commands: [*]*CommandBuffer) void { Impl.queueSubmit(queue, command_count, commands); }