From 7e9e61786029cd91075db8fcef2c64cea35e1218 Mon Sep 17 00:00:00 2001 From: Stephen Gutekanst Date: Fri, 29 Jul 2022 23:25:03 -0700 Subject: [PATCH] gpu: correct name of MapMode -> MapModeFlags Signed-off-by: Stephen Gutekanst --- gpu/src/buffer.zig | 4 ++-- gpu/src/interface.zig | 6 +++--- gpu/src/types.zig | 7 +++---- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/gpu/src/buffer.zig b/gpu/src/buffer.zig index a87356e3..bb76136a 100644 --- a/gpu/src/buffer.zig +++ b/gpu/src/buffer.zig @@ -1,6 +1,6 @@ const std = @import("std"); const ChainedStruct = @import("types.zig").ChainedStruct; -const MapMode = @import("types.zig").MapMode; +const MapModeFlags = @import("types.zig").MapModeFlags; const Impl = @import("interface.zig").Impl; pub const Buffer = opaque { @@ -28,7 +28,7 @@ pub const Buffer = opaque { 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); } diff --git a/gpu/src/interface.zig b/gpu/src/interface.zig index f5dcca4f..2fc04132 100644 --- a/gpu/src/interface.zig +++ b/gpu/src/interface.zig @@ -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, "bufferGetSize", fn (buffer: *gpu.Buffer) callconv(.Inline) u64); 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, "bufferUnmap", 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. // 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 { - 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); @@ -1343,7 +1343,7 @@ pub const StubInterface = Interface(struct { 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; _ = mode; _ = offset; diff --git a/gpu/src/types.zig b/gpu/src/types.zig index e07c354f..f0a49fe5 100644 --- a/gpu/src/types.zig +++ b/gpu/src/types.zig @@ -351,8 +351,7 @@ pub const ColorWriteMaskFlags = packed struct { } }; -// TODO: should be MapModeFlags, I typo'd it -pub const MapMode = packed struct { +pub const MapModeFlags = packed struct { read: 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)); } };