From 48c496c3e58bda26ebde62aeff871e68563a0463 Mon Sep 17 00:00:00 2001 From: Stephen Gutekanst Date: Wed, 9 Mar 2022 09:51:36 -0700 Subject: [PATCH] gpu: centralize PresentMode -> enums.zig Signed-off-by: Stephen Gutekanst --- gpu/src/NativeInstance.zig | 2 +- gpu/src/SwapChain.zig | 2 +- gpu/src/address_mode.zig | 5 ----- gpu/src/enums.zig | 7 +++++++ gpu/src/main.zig | 4 ++-- gpu/src/present_mode.zig | 5 ----- 6 files changed, 11 insertions(+), 14 deletions(-) delete mode 100644 gpu/src/address_mode.zig delete mode 100644 gpu/src/present_mode.zig diff --git a/gpu/src/NativeInstance.zig b/gpu/src/NativeInstance.zig index 2b9ce9c3..893ddd2e 100644 --- a/gpu/src/NativeInstance.zig +++ b/gpu/src/NativeInstance.zig @@ -23,7 +23,7 @@ const SwapChain = @import("SwapChain.zig"); const TextureUsage = @import("texture_usage.zig").TextureUsage; const TextureFormat = @import("texture_format.zig").TextureFormat; -const PresentMode = @import("present_mode.zig").PresentMode; +const PresentMode = @import("enums.zig").PresentMode; const NativeInstance = @This(); diff --git a/gpu/src/SwapChain.zig b/gpu/src/SwapChain.zig index ac772f38..ad948722 100644 --- a/gpu/src/SwapChain.zig +++ b/gpu/src/SwapChain.zig @@ -1,7 +1,7 @@ const std = @import("std"); const TextureUsage = @import("texture_usage.zig").TextureUsage; const TextureFormat = @import("texture_format.zig").TextureFormat; -const PresentMode = @import("present_mode.zig").PresentMode; +const PresentMode = @import("enums.zig").PresentMode; const SwapChain = @This(); diff --git a/gpu/src/address_mode.zig b/gpu/src/address_mode.zig deleted file mode 100644 index 3d210b6a..00000000 --- a/gpu/src/address_mode.zig +++ /dev/null @@ -1,5 +0,0 @@ -const AddressMode = enum(u32) { - repeat = 0x00000000, - mirror_repeat = 0x00000001, - clamp_to_edge = 0x00000002, -}; diff --git a/gpu/src/enums.zig b/gpu/src/enums.zig index 3eba3000..a0919626 100644 --- a/gpu/src/enums.zig +++ b/gpu/src/enums.zig @@ -22,6 +22,12 @@ const AddressMode = enum(u32) { clamp_to_edge = 0x00000002, }; +pub const PresentMode = enum(u32) { + immediate = 0x00000000, + mailbox = 0x00000001, + fifo = 0x00000002, +}; + test "name" { try std.testing.expect(std.mem.eql(u8, @tagName(Feature.timestamp_query), "timestamp_query")); } @@ -29,4 +35,5 @@ test "name" { test "syntax" { _ = Feature; _ = AddressMode; + _ = PresentMode; } diff --git a/gpu/src/main.zig b/gpu/src/main.zig index 27d8367b..2de554f5 100644 --- a/gpu/src/main.zig +++ b/gpu/src/main.zig @@ -39,8 +39,8 @@ pub const SwapChain = @import("SwapChain.zig"); pub const Feature = @import("enums.zig").Feature; pub const TextureUsage = @import("texture_usage.zig").TextureUsage; pub const TextureFormat = @import("texture_format.zig").TextureFormat; -pub const PresentMode = @import("present_mode.zig").PresentMode; -pub const AddressMode = @import("address_mode.zig").AddressMode; +pub const PresentMode = @import("enums.zig").PresentMode; +pub const AddressMode = @import("enums.zig").AddressMode; test "syntax" { _ = Interface; diff --git a/gpu/src/present_mode.zig b/gpu/src/present_mode.zig deleted file mode 100644 index 78b9c76b..00000000 --- a/gpu/src/present_mode.zig +++ /dev/null @@ -1,5 +0,0 @@ -pub const PresentMode = enum(u32) { - immediate = 0x00000000, - mailbox = 0x00000001, - fifo = 0x00000002, -};