From 84c532156ea931d708d0daaccc0a2775aaccc1f3 Mon Sep 17 00:00:00 2001 From: Stephen Gutekanst Date: Fri, 11 Mar 2022 15:47:34 -0700 Subject: [PATCH] gpu: move BufferBindingType -> Buffer.BindingType Signed-off-by: Stephen Gutekanst --- gpu/src/Buffer.zig | 8 ++++++++ gpu/src/enums.zig | 8 -------- gpu/src/main.zig | 1 - gpu/src/structs.zig | 3 +-- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/gpu/src/Buffer.zig b/gpu/src/Buffer.zig index b3a368d5..5237bc35 100644 --- a/gpu/src/Buffer.zig +++ b/gpu/src/Buffer.zig @@ -42,6 +42,13 @@ pub const Descriptor = struct { mapped_at_creation: bool, }; +pub const BindingType = enum(u32) { + none = 0x00000000, + uniform = 0x00000001, + storage = 0x00000002, + read_only_storage = 0x00000003, +}; + test "syntax" { _ = VTable; _ = reference; @@ -49,4 +56,5 @@ test "syntax" { _ = destroy; _ = setLabel; _ = Descriptor; + _ = BindingType; } diff --git a/gpu/src/enums.zig b/gpu/src/enums.zig index 15deb6bd..32d28311 100644 --- a/gpu/src/enums.zig +++ b/gpu/src/enums.zig @@ -57,13 +57,6 @@ pub const BlendOperation = enum(u32) { max = 0x00000004, }; -pub const BufferBindingType = enum(u32) { - none = 0x00000000, - uniform = 0x00000001, - storage = 0x00000002, - read_only_storage = 0x00000003, -}; - pub const BufferMapAsyncStatus = enum(u32) { success = 0x00000000, err = 0x00000001, @@ -350,7 +343,6 @@ test "syntax" { _ = AlphaMode; _ = BlendFactor; _ = BlendOperation; - _ = BufferBindingType; _ = BufferMapAsyncStatus; _ = CompareFunction; _ = CompilationInfoRequestStatus; diff --git a/gpu/src/main.zig b/gpu/src/main.zig index 8e8b6821..a45c8254 100644 --- a/gpu/src/main.zig +++ b/gpu/src/main.zig @@ -99,7 +99,6 @@ pub const AddressMode = @import("enums.zig").AddressMode; pub const AlphaMode = @import("enums.zig").AlphaMode; pub const BlendFactor = @import("enums.zig").BlendFactor; pub const BlendOperation = @import("enums.zig").BlendOperation; -pub const BufferBindingType = @import("enums.zig").BufferBindingType; pub const BufferMapAsyncStatus = @import("enums.zig").BufferMapAsyncStatus; pub const CompareFunction = @import("enums.zig").CompareFunction; pub const CompilationInfoRequestStatus = @import("enums.zig").CompilationInfoRequestStatus; diff --git a/gpu/src/structs.zig b/gpu/src/structs.zig index b1be3d79..05550291 100644 --- a/gpu/src/structs.zig +++ b/gpu/src/structs.zig @@ -2,7 +2,6 @@ const Buffer = @import("Buffer.zig"); const Sampler = @import("Sampler.zig"); const TextureView = @import("TextureView.zig"); -const BufferBindingType = @import("enums.zig").BufferBindingType; const CompilationMessageType = @import("enums.zig").CompilationMessageType; const PrimitiveTopology = @import("enums.zig").PrimitiveTopology; const IndexFormat = @import("enums.zig").IndexFormat; @@ -19,7 +18,7 @@ pub const BindGroupEntry = struct { }; pub const BufferBindingLayout = struct { - type: BufferBindingType, + type: Buffer.BindingType, has_dynamic_offset: bool, min_binding_size: u64, };