From 23aad28093d7a09561580679e6ba18451d94c916 Mon Sep 17 00:00:00 2001 From: Stephen Gutekanst Date: Fri, 11 Mar 2022 15:59:27 -0700 Subject: [PATCH] gpu: move TextureComponentType -> Texture.ComponentType Signed-off-by: Stephen Gutekanst --- gpu/src/Texture.zig | 8 ++++++++ gpu/src/enums.zig | 8 -------- gpu/src/main.zig | 1 - 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/gpu/src/Texture.zig b/gpu/src/Texture.zig index 925cfe78..9586ac70 100644 --- a/gpu/src/Texture.zig +++ b/gpu/src/Texture.zig @@ -148,6 +148,13 @@ pub const Aspect = enum(u32) { plane1_only = 0x00000004, }; +pub const ComponentType = enum(u32) { + float = 0x00000000, + sint = 0x00000001, + uint = 0x00000002, + depth_comparison = 0x00000003, +}; + test "syntax" { _ = VTable; _ = reference; @@ -156,4 +163,5 @@ test "syntax" { _ = Usage; _ = Format; _ = Aspect; + _ = ComponentType; } diff --git a/gpu/src/enums.zig b/gpu/src/enums.zig index ed6e1b42..eacfa443 100644 --- a/gpu/src/enums.zig +++ b/gpu/src/enums.zig @@ -203,13 +203,6 @@ pub const StoreOp = enum(u32) { discard = 0x00000002, }; -pub const TextureComponentType = enum(u32) { - float = 0x00000000, - sint = 0x00000001, - uint = 0x00000002, - depth_comparison = 0x00000003, -}; - pub const TextureDimension = enum(u32) { dimension_1d = 0x00000000, dimension_2d = 0x00000001, @@ -343,7 +336,6 @@ test "syntax" { _ = StencilOperation; _ = StorageTextureAccess; _ = StoreOp; - _ = TextureComponentType; _ = TextureDimension; _ = TextureSampleType; _ = TextureViewDimension; diff --git a/gpu/src/main.zig b/gpu/src/main.zig index e8c22b11..d9df75a1 100644 --- a/gpu/src/main.zig +++ b/gpu/src/main.zig @@ -120,7 +120,6 @@ pub const StencilOperation = @import("enums.zig").StencilOperation; pub const StorageTextureAccess = @import("enums.zig").StorageTextureAccess; pub const StoreOp = @import("enums.zig").StoreOp; // TODO: move to Texture.Foo -pub const TextureComponentType = @import("enums.zig").TextureComponentType; pub const TextureDimension = @import("enums.zig").TextureDimension; pub const TextureSampleType = @import("enums.zig").TextureSampleType; pub const TextureViewDimension = @import("enums.zig").TextureViewDimension;