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

gpu: correct name of MapMode -> MapModeFlags

Browse source 
Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
This commit is contained in:
Stephen Gutekanst 2022-07-29 23:25:03 -07:00 • committed by Stephen Gutekanst
parent 1ce40e1b46
commit 7e9e617860
3 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
gpu/src/buffer.zig
View file

@ -1,6 +1,6 @@
const std = @import("std"); const std = @import("std");
const ChainedStruct = @import("types.zig").ChainedStruct; const ChainedStruct = @import("types.zig").ChainedStruct;
const MapMode = @import("types.zig").MapMode; const MapModeFlags = @import("types.zig").MapModeFlags;
const Impl = @import("interface.zig").Impl; const Impl = @import("interface.zig").Impl;
pub const Buffer = opaque { pub const Buffer = opaque {
@ -28,7 +28,7 @@ pub const Buffer = opaque {
return Impl.bufferGetUsage(buffer); return Impl.bufferGetUsage(buffer);
} }
pub inline fn bufferMapAsync(buffer: *Buffer, mode: MapMode, 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); Impl.bufferMapAsync(buffer, mode, offset, size, callback, userdata);
} }

6
gpu/src/interface.zig
View file

@ -38,7 +38,7 @@ pub fn Interface(comptime T: type) type {
assertDecl(T, "bufferGetMappedRange", fn (buffer: *gpu.Buffer, offset: usize, size: usize) callconv(.Inline) ?*anyopaque); assertDecl(T, "bufferGetMappedRange", fn (buffer: *gpu.Buffer, offset: usize, size: usize) callconv(.Inline) ?*anyopaque);
assertDecl(T, "bufferGetSize", fn (buffer: *gpu.Buffer) callconv(.Inline) u64); assertDecl(T, "bufferGetSize", fn (buffer: *gpu.Buffer) callconv(.Inline) u64);
assertDecl(T, "bufferGetUsage", fn (buffer: *gpu.Buffer) callconv(.Inline) gpu.BufferUsage); assertDecl(T, "bufferGetUsage", fn (buffer: *gpu.Buffer) callconv(.Inline) gpu.BufferUsage);
assertDecl(T, "bufferMapAsync", fn (buffer: *gpu.Buffer, mode: gpu.MapMode, offset: usize, size: usize, callback: gpu.BufferMapCallback, userdata: *anyopaque) callconv(.Inline) void); assertDecl(T, "bufferMapAsync", fn (buffer: *gpu.Buffer, mode: gpu.MapModeFlags, offset: usize, size: usize, callback: gpu.BufferMapCallback, userdata: *anyopaque) callconv(.Inline) void);
assertDecl(T, "bufferSetLabel", fn (buffer: *gpu.Buffer, label: [*:0]const u8) callconv(.Inline) void); assertDecl(T, "bufferSetLabel", fn (buffer: *gpu.Buffer, label: [*:0]const u8) callconv(.Inline) void);
assertDecl(T, "bufferUnmap", fn (buffer: *gpu.Buffer) callconv(.Inline) void); assertDecl(T, "bufferUnmap", fn (buffer: *gpu.Buffer) callconv(.Inline) void);
assertDecl(T, "bufferReference", fn (buffer: *gpu.Buffer) callconv(.Inline) void); assertDecl(T, "bufferReference", fn (buffer: *gpu.Buffer) callconv(.Inline) void);
@ -337,7 +337,7 @@ pub fn Export(comptime T: type) type {
// 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) void { export fn wgpuBufferMapAsync(buffer: *gpu.Buffer, mode: u32, offset: usize, size: usize, callback: gpu.BufferMapCallback, userdata: *anyopaque) void {
T.bufferMapAsync(buffer, @bitCast(gpu.MapMode, mode), offset, size, callback, userdata); T.bufferMapAsync(buffer, @bitCast(gpu.MapModeFlags, mode), offset, size, callback, userdata);
} }
// WGPU_EXPORT void wgpuBufferSetLabel(WGPUBuffer buffer, char const * label); // WGPU_EXPORT void wgpuBufferSetLabel(WGPUBuffer buffer, char const * label);
@ -1343,7 +1343,7 @@ pub const StubInterface = Interface(struct {
unreachable; unreachable;
} }
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.MapModeFlags, offset: usize, size: usize, callback: gpu.BufferMapCallback, userdata: *anyopaque) void {
_ = buffer; _ = buffer;
_ = mode; _ = mode;
_ = offset; _ = offset;

7
gpu/src/types.zig
View file

@ -351,8 +351,7 @@ pub const ColorWriteMaskFlags = packed struct {
} }
}; };
// TODO: should be MapModeFlags, I typo'd it pub const MapModeFlags = packed struct {
pub const MapMode = packed struct {
read: bool = false, read: bool = false,
write: bool = false, write: bool = false,
@ -365,9 +364,9 @@ pub const MapMode = packed struct {
); );
} }
pub const undef = MapMode{}; pub const undef = MapModeFlags{};
pub fn equal(a: MapMode, b: MapMode) bool { pub fn equal(a: MapModeFlags, b: MapModeFlags) bool {
return @truncate(u2, @bitCast(u32, a)) == @truncate(u2, @bitCast(u32, b)); return @truncate(u2, @bitCast(u32, a)) == @truncate(u2, @bitCast(u32, b));
} }
}; };