gpu: convert *opaque -> opaque for Buffer

Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
This commit is contained in:
Stephen Gutekanst 2022-07-29 22:19:20 -07:00 committed by Stephen Gutekanst
parent 13038afb28
commit 1714f43e1f
9 changed files with 29 additions and 29 deletions

View file

@ -22,7 +22,7 @@ pub const BindGroup = opaque {
pub const BindGroupEntry = extern struct {
next_in_chain: ?*const ChainedStruct = null,
binding: u32,
buffer: ?Buffer,
buffer: ?*Buffer,
offset: u64 = 0,
size: u64,
sampler: ?Sampler,

View file

@ -3,48 +3,48 @@ const ChainedStruct = @import("types.zig").ChainedStruct;
const MapModeFlags = @import("types.zig").MapModeFlags;
const Impl = @import("interface.zig").Impl;
pub const Buffer = *opaque {
pub inline fn destroy(buffer: Buffer) void {
pub const Buffer = opaque {
pub inline fn destroy(buffer: *Buffer) void {
Impl.bufferDestroy(buffer);
}
/// Default `offset`: 0
/// Default `size`: `gpu.whole_map_size`
pub inline fn bufferGetConstMappedRange(buffer: Buffer, offset: usize, size: usize) ?*const anyopaque {
pub inline fn bufferGetConstMappedRange(buffer: *Buffer, offset: usize, size: usize) ?*const anyopaque {
return Impl.bufferGetConstMappedRange(buffer, offset, size);
}
/// Default `offset`: 0
/// Default `size`: `gpu.whole_map_size`
pub inline fn bufferGetMappedRange(buffer: Buffer, offset: usize, size: usize) ?*anyopaque {
pub inline fn bufferGetMappedRange(buffer: *Buffer, offset: usize, size: usize) ?*anyopaque {
return Impl.bufferGetMappedRange(buffer, offset, size);
}
pub inline fn bufferGetSize(buffer: Buffer) u64 {
pub inline fn bufferGetSize(buffer: *Buffer) u64 {
return Impl.bufferGetSize(buffer);
}
pub inline fn bufferGetUsage(buffer: Buffer) BufferUsage {
pub inline fn bufferGetUsage(buffer: *Buffer) BufferUsage {
return Impl.bufferGetUsage(buffer);
}
pub inline fn bufferMapAsync(buffer: Buffer, mode: MapModeFlags, offset: usize, size: usize, callback: BufferMapCallback, userdata: *anyopaque) void {
pub inline fn bufferMapAsync(buffer: *Buffer, mode: MapModeFlags, offset: usize, size: usize, callback: BufferMapCallback, userdata: *anyopaque) void {
Impl.bufferMapAsync(buffer, mode, offset, size, callback, userdata);
}
pub inline fn bufferSetLabel(buffer: Buffer, label: [*:0]const u8) void {
pub inline fn bufferSetLabel(buffer: *Buffer, label: [*:0]const u8) void {
Impl.bufferSetLabel(buffer, label);
}
pub inline fn bufferUnmap(buffer: Buffer) void {
pub inline fn bufferUnmap(buffer: *Buffer) void {
Impl.bufferUnmap(buffer);
}
pub inline fn bufferReference(buffer: Buffer) void {
pub inline fn bufferReference(buffer: *Buffer) void {
Impl.bufferReference(buffer);
}
pub inline fn bufferRelease(buffer: Buffer) void {
pub inline fn bufferRelease(buffer: *Buffer) void {
Impl.bufferRelease(buffer);
}
};

View file

@ -23,11 +23,11 @@ pub const CommandEncoder = *opaque {
/// Default `offset`: 0
/// Default `size`: `gpu.whole_size`
pub inline fn clearBuffer(command_encoder: CommandEncoder, buffer: Buffer, offset: u64, size: u64) void {
pub inline fn clearBuffer(command_encoder: CommandEncoder, buffer: *Buffer, offset: u64, size: u64) void {
Impl.commandEncoderClearBuffer(command_encoder, buffer, offset, size);
}
pub inline fn copyBufferToBuffer(command_encoder: CommandEncoder, source: Buffer, source_offset: u64, destination: Buffer, destination_offset: u64, size: u64) void {
pub inline fn copyBufferToBuffer(command_encoder: CommandEncoder, source: *Buffer, source_offset: u64, destination: *Buffer, destination_offset: u64, size: u64) void {
Impl.commandEncoderCopyBufferToBuffer(command_encoder, source, source_offset, destination, destination_offset, size);
}
@ -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);
}
@ -77,7 +77,7 @@ pub const CommandEncoder = *opaque {
Impl.commandEncoderSetLabel(command_encoder, label);
}
pub inline fn writeBuffer(command_encoder: CommandEncoder, buffer: Buffer, buffer_offset: u64, data: [*]const u8, size: u64) void {
pub inline fn writeBuffer(command_encoder: CommandEncoder, buffer: *Buffer, buffer_offset: u64, data: [*]const u8, size: u64) void {
Impl.commandEncoderWriteBuffer(command_encoder, buffer, buffer_offset, data, size);
}

View file

@ -10,7 +10,7 @@ pub const ComputePassEncoder = *opaque {
Impl.computePassEncoderDispatchWorkgroups(compute_pass_encoder, workgroup_count_x, workgroup_count_y, workgroup_count_z);
}
pub inline fn dispatchWorkgroupsIndirect(compute_pass_encoder: ComputePassEncoder, indirect_buffer: Buffer, indirect_offset: u64) void {
pub inline fn dispatchWorkgroupsIndirect(compute_pass_encoder: ComputePassEncoder, indirect_buffer: *Buffer, indirect_offset: u64) void {
Impl.computePassEncoderDispatchWorkgroupsIndirect(compute_pass_encoder, indirect_buffer, indirect_offset);
}

View file

@ -49,7 +49,7 @@ pub const Device = *opaque {
return Impl.deviceCreateBindGroupLayout(device, descriptor);
}
pub inline fn createBuffer(device: Device, descriptor: *const BufferDescriptor) Buffer {
pub inline fn createBuffer(device: Device, descriptor: *const BufferDescriptor) *Buffer {
return Impl.deviceCreateBuffer(device, descriptor);
}
@ -65,7 +65,7 @@ pub const Device = *opaque {
Impl.deviceCreateComputePipelineAsync(device, descriptor, callback, userdata);
}
pub inline fn createErrorBuffer(device: Device) Buffer {
pub inline fn createErrorBuffer(device: Device) *Buffer {
return Impl.deviceCreateErrorBuffer(device);
}

View file

@ -24,7 +24,7 @@ pub const Queue = *opaque {
Impl.queueSubmit(queue, command_count, commands);
}
pub inline fn writeBuffer(queue: Queue, buffer: Buffer, buffer_offset: u64, data: *anyopaque, size: usize) void {
pub inline fn writeBuffer(queue: Queue, buffer: *Buffer, buffer_offset: u64, data: *anyopaque, size: usize) void {
Impl.queueWriteBuffer(queue, buffer, buffer_offset, data, size);
}

View file

@ -24,11 +24,11 @@ pub const RenderBundleEncoder = *opaque {
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);
}
@ -56,7 +56,7 @@ pub const RenderBundleEncoder = *opaque {
/// 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);
}
@ -70,7 +70,7 @@ pub const RenderBundleEncoder = *opaque {
/// 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);
}

View file

@ -27,11 +27,11 @@ pub const RenderPassEncoder = *opaque {
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);
}
@ -71,7 +71,7 @@ pub const RenderPassEncoder = *opaque {
/// 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);
}
@ -93,7 +93,7 @@ pub const RenderPassEncoder = *opaque {
/// 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);
}

View file

@ -568,7 +568,7 @@ pub const DepthStencilState = extern struct {
pub const ImageCopyBuffer = extern struct {
next_in_chain: ?*const ChainedStruct = null,
layout: TextureDataLayout,
buffer: Buffer,
buffer: *Buffer,
};
pub const ImageCopyTexture = extern struct {