From a463a0c7cd76be7a1be8004199276af10773ce63 Mon Sep 17 00:00:00 2001
From: Stephen Gutekanst <stephen@hexops.com>
Date: Fri, 11 Mar 2022 14:34:18 -0700
Subject: [PATCH] gpu: unify data structs in single structs.zig

Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
---
 gpu/src/Adapter.zig        |  2 +-
 gpu/src/Device.zig         |  2 +-
 gpu/src/Limits.zig         | 27 ---------------------------
 gpu/src/NativeInstance.zig |  2 +-
 gpu/src/main.zig           |  2 +-
 gpu/src/structs.zig        | 29 +++++++++++++++++++++++++++++
 6 files changed, 33 insertions(+), 31 deletions(-)
 delete mode 100644 gpu/src/Limits.zig
 create mode 100644 gpu/src/structs.zig

diff --git a/gpu/src/Adapter.zig b/gpu/src/Adapter.zig
index 5e40cd40..60e52d27 100644
--- a/gpu/src/Adapter.zig
+++ b/gpu/src/Adapter.zig
@@ -20,7 +20,7 @@
 const std = @import("std");
 
 const Feature = @import("enums.zig").Feature;
-const Limits = @import("Limits.zig");
+const Limits = @import("structs.zig").Limits;
 const Device = @import("Device.zig");
 
 const Adapter = @This();
diff --git a/gpu/src/Device.zig b/gpu/src/Device.zig
index ddcad79a..b99ff7e0 100644
--- a/gpu/src/Device.zig
+++ b/gpu/src/Device.zig
@@ -7,7 +7,7 @@
 //! https://gpuweb.github.io/gpuweb/#devices
 //! https://gpuweb.github.io/gpuweb/#gpuadapter
 const Feature = @import("enums.zig").Feature;
-const Limits = @import("Limits.zig");
+const Limits = @import("structs.zig").Limits;
 const Queue = @import("Queue.zig");
 const ShaderModule = @import("ShaderModule.zig");
 const Surface = @import("Surface.zig");
diff --git a/gpu/src/Limits.zig b/gpu/src/Limits.zig
deleted file mode 100644
index a565d875..00000000
--- a/gpu/src/Limits.zig
+++ /dev/null
@@ -1,27 +0,0 @@
-// TODO: docs
-max_texture_dimension_1d: u32,
-max_texture_dimension_2d: u32,
-max_texture_dimension_3d: u32,
-max_texture_array_layers: u32,
-max_bind_groups: u32,
-max_dynamic_uniform_buffers_per_pipeline_layout: u32,
-max_dynamic_storage_buffers_per_pipeline_layout: u32,
-max_sampled_textures_per_shader_stage: u32,
-max_samplers_per_shader_stage: u32,
-max_storage_buffers_per_shader_stage: u32,
-max_storage_textures_per_shader_stage: u32,
-max_uniform_buffers_per_shader_stage: u32,
-max_uniform_buffer_binding_size: u64,
-max_storage_buffer_binding_size: u64,
-min_uniform_buffer_offset_alignment: u32,
-min_storage_buffer_offset_alignment: u32,
-max_vertex_buffers: u32,
-max_vertex_attributes: u32,
-max_vertex_buffer_array_stride: u32,
-max_inter_stage_shader_components: u32,
-max_compute_workgroup_storage_size: u32,
-max_compute_invocations_per_workgroup: u32,
-max_compute_workgroup_size_x: u32,
-max_compute_workgroup_size_y: u32,
-max_compute_workgroup_size_z: u32,
-max_compute_workgroups_per_dimension: u32,
diff --git a/gpu/src/NativeInstance.zig b/gpu/src/NativeInstance.zig
index 4c99c80a..f1651031 100644
--- a/gpu/src/NativeInstance.zig
+++ b/gpu/src/NativeInstance.zig
@@ -15,7 +15,7 @@ const RequestDeviceResponse = Adapter.RequestDeviceResponse;
 
 const Device = @import("Device.zig");
 const Surface = @import("Surface.zig");
-const Limits = @import("Limits.zig");
+const Limits = @import("structs.zig").Limits;
 const Queue = @import("Queue.zig");
 const CommandBuffer = @import("CommandBuffer.zig");
 const ShaderModule = @import("ShaderModule.zig");
diff --git a/gpu/src/main.zig b/gpu/src/main.zig
index 86c8426e..5fff1bf4 100644
--- a/gpu/src/main.zig
+++ b/gpu/src/main.zig
@@ -52,7 +52,7 @@ pub const NativeInstance = @import("NativeInstance.zig");
 pub const Adapter = @import("Adapter.zig");
 pub const Device = @import("Device.zig");
 pub const Surface = @import("Surface.zig");
-pub const Limits = @import("Limits.zig");
+pub const Limits = @import("structs.zig").Limits;
 pub const Queue = @import("Queue.zig");
 pub const CommandBuffer = @import("CommandBuffer.zig");
 pub const ShaderModule = @import("ShaderModule.zig");
diff --git a/gpu/src/structs.zig b/gpu/src/structs.zig
new file mode 100644
index 00000000..0ed13228
--- /dev/null
+++ b/gpu/src/structs.zig
@@ -0,0 +1,29 @@
+// TODO: docs
+pub const Limits = struct {
+    max_texture_dimension_1d: u32,
+    max_texture_dimension_2d: u32,
+    max_texture_dimension_3d: u32,
+    max_texture_array_layers: u32,
+    max_bind_groups: u32,
+    max_dynamic_uniform_buffers_per_pipeline_layout: u32,
+    max_dynamic_storage_buffers_per_pipeline_layout: u32,
+    max_sampled_textures_per_shader_stage: u32,
+    max_samplers_per_shader_stage: u32,
+    max_storage_buffers_per_shader_stage: u32,
+    max_storage_textures_per_shader_stage: u32,
+    max_uniform_buffers_per_shader_stage: u32,
+    max_uniform_buffer_binding_size: u64,
+    max_storage_buffer_binding_size: u64,
+    min_uniform_buffer_offset_alignment: u32,
+    min_storage_buffer_offset_alignment: u32,
+    max_vertex_buffers: u32,
+    max_vertex_attributes: u32,
+    max_vertex_buffer_array_stride: u32,
+    max_inter_stage_shader_components: u32,
+    max_compute_workgroup_storage_size: u32,
+    max_compute_invocations_per_workgroup: u32,
+    max_compute_workgroup_size_x: u32,
+    max_compute_workgroup_size_y: u32,
+    max_compute_workgroup_size_z: u32,
+    max_compute_workgroups_per_dimension: u32,
+};
\ No newline at end of file