From 7271df966eb0fcd403c45491b178a21e4feee833 Mon Sep 17 00:00:00 2001 From: Stephen Gutekanst Date: Fri, 11 Mar 2022 16:00:57 -0700 Subject: [PATCH] gpu: move TextureSampleType -> Texture.SampleType Signed-off-by: Stephen Gutekanst --- gpu/src/Texture.zig | 10 ++++++++++ gpu/src/enums.zig | 10 ---------- gpu/src/main.zig | 1 - 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/gpu/src/Texture.zig b/gpu/src/Texture.zig index f55a823a..2287fcc6 100644 --- a/gpu/src/Texture.zig +++ b/gpu/src/Texture.zig @@ -161,6 +161,15 @@ pub const Dimension = enum(u32) { dimension_3d = 0x00000002, }; +pub const SampleType = enum(u32) { + none = 0x00000000, + float = 0x00000001, + unfilterable_float = 0x00000002, + depth = 0x00000003, + sint = 0x00000004, + uint = 0x00000005, +}; + test "syntax" { _ = VTable; _ = reference; @@ -171,4 +180,5 @@ test "syntax" { _ = Aspect; _ = ComponentType; _ = Dimension; + _ = SampleType; } diff --git a/gpu/src/enums.zig b/gpu/src/enums.zig index d423c45f..e68c2648 100644 --- a/gpu/src/enums.zig +++ b/gpu/src/enums.zig @@ -203,15 +203,6 @@ pub const StoreOp = enum(u32) { discard = 0x00000002, }; -pub const TextureSampleType = enum(u32) { - none = 0x00000000, - float = 0x00000001, - unfilterable_float = 0x00000002, - depth = 0x00000003, - sint = 0x00000004, - uint = 0x00000005, -}; - pub const TextureViewDimension = enum(u32) { dimension_none = 0x00000000, dimension_1d = 0x00000001, @@ -330,7 +321,6 @@ test "syntax" { _ = StencilOperation; _ = StorageTextureAccess; _ = StoreOp; - _ = TextureSampleType; _ = TextureViewDimension; _ = VertexFormat; _ = VertexStepMode; diff --git a/gpu/src/main.zig b/gpu/src/main.zig index 6245a488..df270aab 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 TextureSampleType = @import("enums.zig").TextureSampleType; pub const TextureViewDimension = @import("enums.zig").TextureViewDimension; pub const VertexFormat = @import("enums.zig").VertexFormat; pub const VertexStepMode = @import("enums.zig").VertexStepMode;