From 27df1e7ca8a95cfd685f36013eb1445c606e3f7d Mon Sep 17 00:00:00 2001
From: Stephen Gutekanst <stephen@hexops.com>
Date: Fri, 12 Aug 2022 10:47:59 -0700
Subject: [PATCH] gpu: workaround stage2 usingnamespace bug

See ziglang/zig#12429

Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
---
 gpu/src/main.zig         |  8 --------
 gpu/src/texture.zig      |  6 +++---
 gpu/src/texture_view.zig |  7 +++----
 gpu/src/types.zig        | 10 ++++++++--
 4 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/gpu/src/main.zig b/gpu/src/main.zig
index 2ae99596..ea50da72 100644
--- a/gpu/src/main.zig
+++ b/gpu/src/main.zig
@@ -1,13 +1,5 @@
 const std = @import("std");
 
-pub const array_layer_count_undef = 0xffffffff;
-pub const copy_stride_undef = 0xffffffff;
-pub const limit_u32_undef = 0xffffffff;
-pub const limit_u64_undef = 0xffffffffffffffff;
-pub const mip_level_count_undef = 0xffffffff;
-pub const whole_map_size = std.math.maxInt(usize);
-pub const whole_size = 0xffffffffffffffff;
-
 pub usingnamespace @import("adapter.zig");
 pub usingnamespace @import("bind_group.zig");
 pub usingnamespace @import("bind_group_layout.zig");
diff --git a/gpu/src/texture.zig b/gpu/src/texture.zig
index 116052fa..e47dca41 100644
--- a/gpu/src/texture.zig
+++ b/gpu/src/texture.zig
@@ -3,7 +3,7 @@ const ChainedStruct = @import("types.zig").ChainedStruct;
 const TextureView = @import("texture_view.zig").TextureView;
 const Extent3D = @import("types.zig").Extent3D;
 const Impl = @import("interface.zig").Impl;
-const copy_stride_undef = @import("main.zig").copy_stride_undef;
+const types = @import("types.zig");
 
 pub const Texture = opaque {
     pub const Aspect = enum(u32) {
@@ -169,8 +169,8 @@ pub const Texture = opaque {
     pub const DataLayout = extern struct {
         next_in_chain: ?*const ChainedStruct = null,
         offset: u64 = 0,
-        bytes_per_row: u32 = copy_stride_undef,
-        rows_per_image: u32 = copy_stride_undef,
+        bytes_per_row: u32 = types.copy_stride_undef,
+        rows_per_image: u32 = types.copy_stride_undef,
     };
 
     pub const Descriptor = extern struct {
diff --git a/gpu/src/texture_view.zig b/gpu/src/texture_view.zig
index 0f448c04..9fa88267 100644
--- a/gpu/src/texture_view.zig
+++ b/gpu/src/texture_view.zig
@@ -1,8 +1,7 @@
 const ChainedStruct = @import("types.zig").ChainedStruct;
 const Texture = @import("texture.zig").Texture;
 const Impl = @import("interface.zig").Impl;
-const mip_level_count_undef = @import("main.zig").mip_level_count_undef;
-const array_layer_count_undef = @import("main.zig").array_layer_count_undef;
+const types = @import("types.zig");
 
 pub const TextureView = opaque {
     pub const Dimension = enum(u32) {
@@ -21,9 +20,9 @@ pub const TextureView = opaque {
         format: Texture.Format = .undef,
         dimension: Dimension = .dimension_undef,
         base_mip_level: u32 = 0,
-        mip_level_count: u32 = mip_level_count_undef,
+        mip_level_count: u32 = types.mip_level_count_undef,
         base_array_layer: u32 = 0,
-        array_layer_count: u32 = array_layer_count_undef,
+        array_layer_count: u32 = types.array_layer_count_undef,
         aspect: Texture.Aspect = .all,
     };
 
diff --git a/gpu/src/types.zig b/gpu/src/types.zig
index 431461ac..451b3383 100644
--- a/gpu/src/types.zig
+++ b/gpu/src/types.zig
@@ -6,8 +6,14 @@ const Buffer = @import("buffer.zig").Buffer;
 const ShaderModule = @import("shader_module.zig").ShaderModule;
 const QuerySet = @import("query_set.zig").QuerySet;
 const Surface = @import("surface.zig").Surface;
-const limit_u32_undef = @import("main.zig").limit_u32_undef;
-const limit_u64_undef = @import("main.zig").limit_u64_undef;
+
+pub const array_layer_count_undef = 0xffffffff;
+pub const copy_stride_undef = 0xffffffff;
+pub const limit_u32_undef = 0xffffffff;
+pub const limit_u64_undef = 0xffffffffffffffff;
+pub const mip_level_count_undef = 0xffffffff;
+pub const whole_map_size = std.math.maxInt(usize);
+pub const whole_size = 0xffffffffffffffff;
 
 /// Generic function pointer type, used for returning API function pointers. Must be
 /// cast to the right `fn (...) callconv(.C) T` type before use.