From ceb6c2b41b346c8237ee2c3283f1a1287dc7a1b7 Mon Sep 17 00:00:00 2001 From: Stephen Gutekanst Date: Sat, 30 Jul 2022 00:13:54 -0700 Subject: [PATCH] gpu: correct name Buffer.Usage -> Buffer.UsageFlags Signed-off-by: Stephen Gutekanst --- gpu/src/buffer.zig | 11 +++++------ gpu/src/interface.zig | 6 +++--- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/gpu/src/buffer.zig b/gpu/src/buffer.zig index efb823a0..657a363c 100644 --- a/gpu/src/buffer.zig +++ b/gpu/src/buffer.zig @@ -22,8 +22,7 @@ pub const Buffer = opaque { unmapped_before_callback = 0x00000005, }; - // TODO: should be UsageFlags - pub const Usage = packed struct { + pub const UsageFlags = packed struct { map_read: bool = false, map_write: bool = false, copy_src: bool = false, @@ -44,9 +43,9 @@ pub const Buffer = opaque { ); } - pub const none = Usage{}; + pub const none = UsageFlags{}; - pub fn equal(a: Usage, b: Usage) bool { + pub fn equal(a: UsageFlags, b: UsageFlags) bool { return @truncate(u10, @bitCast(u32, a)) == @truncate(u10, @bitCast(u32, b)); } }; @@ -61,7 +60,7 @@ pub const Buffer = opaque { pub const Descriptor = extern struct { next_in_chain: ?*const ChainedStruct = null, label: ?[*:0]const u8 = null, - usage: Usage, + usage: UsageFlags, size: u64, mapped_at_creation: bool = true, }; @@ -86,7 +85,7 @@ pub const Buffer = opaque { return Impl.bufferGetSize(buffer); } - pub inline fn bufferGetUsage(buffer: *Buffer) Buffer.Usage { + pub inline fn bufferGetUsage(buffer: *Buffer) Buffer.UsageFlags { return Impl.bufferGetUsage(buffer); } diff --git a/gpu/src/interface.zig b/gpu/src/interface.zig index 920dbec1..aa7ccf86 100644 --- a/gpu/src/interface.zig +++ b/gpu/src/interface.zig @@ -35,7 +35,7 @@ pub fn Interface(comptime T: type) type { assertDecl(T, "bufferGetConstMappedRange", fn (buffer: *gpu.Buffer, offset: usize, size: usize) callconv(.Inline) ?*const 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, "bufferGetUsage", fn (buffer: *gpu.Buffer) callconv(.Inline) gpu.Buffer.Usage); + assertDecl(T, "bufferGetUsage", fn (buffer: *gpu.Buffer) callconv(.Inline) gpu.Buffer.UsageFlags); assertDecl(T, "bufferMapAsync", fn (buffer: *gpu.Buffer, mode: gpu.MapModeFlags, offset: usize, size: usize, callback: gpu.Buffer.MapCallback, 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); @@ -327,7 +327,7 @@ pub fn Export(comptime T: type) type { } // WGPU_EXPORT WGPUBufferUsage wgpuBufferGetUsage(WGPUBuffer buffer); - export fn wgpuBufferGetUsage(buffer: *gpu.Buffer) gpu.Buffer.Usage { + export fn wgpuBufferGetUsage(buffer: *gpu.Buffer) gpu.Buffer.UsageFlags { return T.bufferGetUsage(buffer); } @@ -1336,7 +1336,7 @@ pub const StubInterface = Interface(struct { unreachable; } - pub inline fn bufferGetUsage(buffer: *gpu.Buffer) gpu.Buffer.Usage { + pub inline fn bufferGetUsage(buffer: *gpu.Buffer) gpu.Buffer.UsageFlags { _ = buffer; unreachable; }