From bbd058f23e6fd42bdacb4592fe6e2ae9d732eb68 Mon Sep 17 00:00:00 2001
From: Stephen Gutekanst <stephen@hexops.com>
Date: Fri, 11 Mar 2022 16:40:43 -0700
Subject: [PATCH] gpu: move Texture.ViewDimension -> TextureView.Dimension

Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
---
 gpu/src/ExternalTexture.zig |  5 +++--
 gpu/src/PipelineLayout.zig  |  4 +++-
 gpu/src/Sampler.zig         |  2 +-
 gpu/src/Texture.zig         | 15 +++------------
 gpu/src/TextureView.zig     | 13 ++++++++++++-
 gpu/src/enums.zig           |  2 +-
 gpu/src/structs.zig         |  2 +-
 7 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/gpu/src/ExternalTexture.zig b/gpu/src/ExternalTexture.zig
index b9c877c2..b5bb337e 100644
--- a/gpu/src/ExternalTexture.zig
+++ b/gpu/src/ExternalTexture.zig
@@ -1,4 +1,5 @@
 const Texture = @import("Texture.zig");
+const TextureView = @import("TextureView.zig");
 const PredefinedColorSpace = @import("enums.zig").PredefinedColorSpace;
 
 const ExternalTexture = @This();
@@ -33,8 +34,8 @@ pub inline fn destroy(texture: ExternalTexture) void {
 
 pub const Descriptor = struct {
     label: ?[*:0]const u8 = null,
-    plane0: Texture.View,
-    plane1: Texture.View,
+    plane0: TextureView,
+    plane1: TextureView,
     color_space: PredefinedColorSpace,
 };
 
diff --git a/gpu/src/PipelineLayout.zig b/gpu/src/PipelineLayout.zig
index a0fd009b..5e0fda67 100644
--- a/gpu/src/PipelineLayout.zig
+++ b/gpu/src/PipelineLayout.zig
@@ -1,3 +1,5 @@
+const BindGroupLayout = @import("BindGroupLayout.zig");
+
 const BindGroup = @import("BindGroup.zig");
 
 const PipelineLayout = @This();
@@ -27,7 +29,7 @@ pub inline fn setLabel(qset: PipelineLayout, label: [:0]const u8) void {
 
 pub const Descriptor = struct {
     label: ?[*:0]const u8 = null,
-    bind_group_layouts: []const BindGroup.Layout,
+    bind_group_layouts: []const BindGroupLayout,
 };
 
 test "syntax" {
diff --git a/gpu/src/Sampler.zig b/gpu/src/Sampler.zig
index 98ac604d..fc69931d 100644
--- a/gpu/src/Sampler.zig
+++ b/gpu/src/Sampler.zig
@@ -1,6 +1,6 @@
 const AddressMode = @import("enums.zig").AddressMode;
 const FilterMode = @import("enums.zig").FilterMode;
-const CompareFunction = @import("data.zig").CompareFunction;
+const CompareFunction = @import("enums.zig").CompareFunction;
 
 const Sampler = @This();
 
diff --git a/gpu/src/Texture.zig b/gpu/src/Texture.zig
index b1971678..5e97e6c0 100644
--- a/gpu/src/Texture.zig
+++ b/gpu/src/Texture.zig
@@ -1,3 +1,5 @@
+const TextureView = @import("TextureView.zig");
+
 const Texture = @This();
 
 /// The type erased pointer to the Texture implementation
@@ -170,19 +172,9 @@ pub const SampleType = enum(u32) {
     uint = 0x00000005,
 };
 
-pub const ViewDimension = enum(u32) {
-    dimension_none = 0x00000000,
-    dimension_1d = 0x00000001,
-    dimension_2d = 0x00000002,
-    dimension_2d_array = 0x00000003,
-    dimension_cube = 0x00000004,
-    dimension_cube_array = 0x00000005,
-    dimension_3d = 0x00000006,
-};
-
 pub const BindingLayout = struct {
     sample_type: SampleType,
-    view_dimension: ViewDimension,
+    view_dimension: TextureView.Dimension,
     multisampled: bool,
 };
 
@@ -203,7 +195,6 @@ test "syntax" {
     _ = ComponentType;
     _ = Dimension;
     _ = SampleType;
-    _ = ViewDimension;
     _ = BindingLayout;
     _ = DataLayout;
 }
diff --git a/gpu/src/TextureView.zig b/gpu/src/TextureView.zig
index a339a3bb..26aadef0 100644
--- a/gpu/src/TextureView.zig
+++ b/gpu/src/TextureView.zig
@@ -28,7 +28,7 @@ pub inline fn setLabel(texture_view: TextureView, label: [:0]const u8) void {
 pub const Descriptor = struct {
     label: ?[*:0]const u8 = null,
     format: Texture.Format,
-    dimension: Texture.ViewDimension,
+    dimension: TextureView.Dimension,
     base_mip_level: u32,
     mip_level_count: u32,
     base_array_layer: u32,
@@ -36,9 +36,20 @@ pub const Descriptor = struct {
     aspect: Texture.Aspect,
 };
 
+pub const Dimension = enum(u32) {
+    dimension_none = 0x00000000,
+    dimension_1d = 0x00000001,
+    dimension_2d = 0x00000002,
+    dimension_2d_array = 0x00000003,
+    dimension_cube = 0x00000004,
+    dimension_cube_array = 0x00000005,
+    dimension_3d = 0x00000006,
+};
+
 test "syntax" {
     _ = VTable;
     _ = reference;
     _ = release;
     _ = Descriptor;
+    _ = Dimension;
 }
diff --git a/gpu/src/enums.zig b/gpu/src/enums.zig
index e68467b9..003f76c7 100644
--- a/gpu/src/enums.zig
+++ b/gpu/src/enums.zig
@@ -16,7 +16,7 @@ pub const Feature = enum(u32) {
     dawn_native = 0x000003ec,
 };
 
-const AddressMode = enum(u32) {
+pub const AddressMode = enum(u32) {
     repeat = 0x00000000,
     mirror_repeat = 0x00000001,
     clamp_to_edge = 0x00000002,
diff --git a/gpu/src/structs.zig b/gpu/src/structs.zig
index 9926b56c..599e81f2 100644
--- a/gpu/src/structs.zig
+++ b/gpu/src/structs.zig
@@ -41,7 +41,7 @@ pub const PrimitiveState = struct {
 pub const StorageTextureBindingLayout = struct {
     access: StorageTextureAccess,
     format: Texture.Format,
-    view_dimension: Texture.ViewDimension,
+    view_dimension: TextureView.Dimension,
 };
 
 pub const DepthStencilState = struct {