zig/mach
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gpu: remove invalid TODOs, fix bufferMapAsync return type

Browse source 
Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
This commit is contained in:
Stephen Gutekanst 2022-07-26 20:46:55 -07:00 • committed by Stephen Gutekanst
parent 382c46c54f
commit 6961700b94
3 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
gpu/src/buffer.zig
View file

@ -24,8 +24,8 @@ pub const Buffer = *opaque {
return impl.bufferGetUsage(buffer); return impl.bufferGetUsage(buffer);
} }
pub inline fn bufferMapAsync(buffer: Buffer, mode: MapModeFlags, offset: usize, size: usize, callback: BufferMapCallback, userdata: *anyopaque) u64 { pub inline fn bufferMapAsync(buffer: Buffer, mode: MapModeFlags, offset: usize, size: usize, callback: BufferMapCallback, userdata: *anyopaque) void {
return impl.bufferMapAsync(buffer, mode, offset, size, callback, userdata); 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 {

2
gpu/src/dawn.zig
View file

@ -3,13 +3,11 @@ const Texture = @import("texture.zig").Texture;
const TextureUsageFlags = @import("texture.zig").TextureUsageFlags; const TextureUsageFlags = @import("texture.zig").TextureUsageFlags;
pub const CacheDeviceDescriptor = extern struct { pub const CacheDeviceDescriptor = extern struct {
// TODO: file an issue on Dawn: why not named nextInChain?
chain: ChainedStruct, chain: ChainedStruct,
isolation_key: [*:0]const u8, isolation_key: [*:0]const u8,
}; };
pub const EncoderInternalUsageDescriptor = extern struct { pub const EncoderInternalUsageDescriptor = extern struct {
// TODO: file an issue on Dawn: why not named nextInChain?
chain: ChainedStruct, chain: ChainedStruct,
use_internal_usages: bool, use_internal_usages: bool,
}; };

10
gpu/src/interface.zig
View file

@ -38,7 +38,7 @@ pub fn Interface(comptime Impl: type) type {
assertDecl(Impl, "bufferGetMappedRange", fn (buffer: gpu.Buffer, offset: usize, size: usize) callconv(.Inline) *anyopaque); assertDecl(Impl, "bufferGetMappedRange", fn (buffer: gpu.Buffer, offset: usize, size: usize) callconv(.Inline) *anyopaque);
assertDecl(Impl, "bufferGetSize", fn (buffer: gpu.Buffer) callconv(.Inline) u64); assertDecl(Impl, "bufferGetSize", fn (buffer: gpu.Buffer) callconv(.Inline) u64);
assertDecl(Impl, "bufferGetUsage", fn (buffer: gpu.Buffer) callconv(.Inline) gpu.BufferUsage); assertDecl(Impl, "bufferGetUsage", fn (buffer: gpu.Buffer) callconv(.Inline) gpu.BufferUsage);
assertDecl(Impl, "bufferMapAsync", fn (buffer: gpu.Buffer, mode: gpu.MapMode, offset: usize, size: usize, callback: gpu.BufferMapCallback, userdata: *anyopaque) callconv(.Inline) u64); assertDecl(Impl, "bufferMapAsync", fn (buffer: gpu.Buffer, mode: gpu.MapMode, offset: usize, size: usize, callback: gpu.BufferMapCallback, userdata: *anyopaque) callconv(.Inline) void);
assertDecl(Impl, "bufferSetLabel", fn (buffer: gpu.Buffer, label: [*:0]const u8) callconv(.Inline) void); assertDecl(Impl, "bufferSetLabel", fn (buffer: gpu.Buffer, label: [*:0]const u8) callconv(.Inline) void);
assertDecl(Impl, "bufferUnmap", fn (buffer: gpu.Buffer) callconv(.Inline) void); assertDecl(Impl, "bufferUnmap", fn (buffer: gpu.Buffer) callconv(.Inline) void);
assertDecl(Impl, "bufferReference", fn (buffer: gpu.Buffer) callconv(.Inline) void); assertDecl(Impl, "bufferReference", fn (buffer: gpu.Buffer) callconv(.Inline) void);
@ -340,8 +340,8 @@ pub fn Export(comptime Impl: type) type {
// TODO: Zig cannot currently export a packed struct gpu.MapModeFlags, so we use a u32 for // TODO: Zig cannot currently export a packed struct gpu.MapModeFlags, so we use a u32 for
// now. // now.
// WGPU_EXPORT void wgpuBufferMapAsync(WGPUBuffer buffer, WGPUMapModeFlags mode, size_t offset, size_t size, WGPUBufferMapCallback callback, void * userdata); // WGPU_EXPORT void wgpuBufferMapAsync(WGPUBuffer buffer, WGPUMapModeFlags mode, size_t offset, size_t size, WGPUBufferMapCallback callback, void * userdata);
export fn wgpuBufferMapAsync(buffer: gpu.Buffer, mode: u32, offset: usize, size: usize, callback: gpu.BufferMapCallback, userdata: *anyopaque) u64 { export fn wgpuBufferMapAsync(buffer: gpu.Buffer, mode: u32, offset: usize, size: usize, callback: gpu.BufferMapCallback, userdata: *anyopaque) void {
return Impl.bufferMapAsync(buffer, @bitCast(gpu.MapMode, mode), offset, size, callback, userdata); Impl.bufferMapAsync(buffer, @bitCast(gpu.MapMode, mode), offset, size, callback, userdata);
} }
// WGPU_EXPORT void wgpuBufferSetLabel(WGPUBuffer buffer, char const * label); // WGPU_EXPORT void wgpuBufferSetLabel(WGPUBuffer buffer, char const * label);
@ -1367,8 +1367,7 @@ pub const StubInterface = Interface(struct {
unreachable; unreachable;
} }
// TODO: should return void, I typo'd it pub inline fn bufferMapAsync(buffer: gpu.Buffer, mode: gpu.MapMode, offset: usize, size: usize, callback: gpu.BufferMapCallback, userdata: *anyopaque) void {
pub inline fn bufferMapAsync(buffer: gpu.Buffer, mode: gpu.MapMode, offset: usize, size: usize, callback: gpu.BufferMapCallback, userdata: *anyopaque) u64 {
_ = buffer; _ = buffer;
_ = mode; _ = mode;
_ = offset; _ = offset;
@ -1676,7 +1675,6 @@ pub const StubInterface = Interface(struct {
unreachable; unreachable;
} }
// TODO: should be deviceCreateBuffer elsewhere
pub inline fn deviceCreateBuffer(device: gpu.Device, descriptor: *const gpu.BufferDescriptor) gpu.Buffer { pub inline fn deviceCreateBuffer(device: gpu.Device, descriptor: *const gpu.BufferDescriptor) gpu.Buffer {
_ = device; _ = device;
_ = descriptor; _ = descriptor;