update wgpu

ScanMountGoat · Jan 15, 2025 · a1e4787 · a1e4787
1 parent 3c7d0b9
commit a1e4787
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 10 deletions.
diff --git a/example/Cargo.toml b/example/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 
 [dependencies]
 winit = "0.30"
-wgpu = "23.0.0"
+wgpu = "24.0.0"
 futures = "0.3"
 bytemuck = { version = "1.19", features = ["derive"] }
 encase = { version = "0.10.0", features = ["glam"] }

diff --git a/example/src/main.rs b/example/src/main.rs
@@ -30,7 +30,7 @@ struct State {
 impl State {
     async fn new(window: Window) -> Self {
         let window = Arc::new(window);
-        let instance = wgpu::Instance::new(wgpu::InstanceDescriptor {
+        let instance = wgpu::Instance::new(&wgpu::InstanceDescriptor {
             backends: wgpu::Backends::all(),
             ..Default::default()
         });

diff --git a/wgsl_to_wgpu/Cargo.toml b/wgsl_to_wgpu/Cargo.toml
@@ -10,8 +10,8 @@ readme = "../README.md"
 edition = "2021"
 
 [dependencies]
-naga = { version = "23.0.0", features = ["wgsl-in"] }
-wgpu-types = "23.0.0"
+naga = { version = "24.0.0", features = ["wgsl-in"] }
+wgpu-types = "24.0.0"
 syn = "2.0"
 quote = "1.0"
 proc-macro2 = "1.0"

diff --git a/wgsl_to_wgpu/src/data/bindgroup/vertex_fragment.wgsl b/wgsl_to_wgpu/src/data/bindgroup/vertex_fragment.wgsl
@@ -43,14 +43,14 @@ fn use_vars() -> f32 {
     x = scalar;
     x = vector.x;
     x = matrix[0][0];
-    x = textureLoad(color_texture1, vec2(0), 0);
-    x = textureLoad(color_texture2, vec2(0), 0);
+    x = f32(textureLoad(color_texture1, vec2(0), 0).x);
+    x = f32(textureLoad(color_texture2, vec2(0), 0).x);
     x = textureSample(color_texture3, color_sampler, vec2(0.0)).x;
     x = textureSampleCompare(depth_texture, comparison_sampler, vec2(0.0), 0.0);
-    x = textureLoad(storage_tex_read, vec2(0));
-    x = textureLoad(storage_tex_read_write, vec2(0));
-    x = textureLoad(color_texture_array_2d, vec2(0), 0, 0);
-    x = textureLoad(color_texture_array_cube, vec3(0), 0, 0);
+    x = textureLoad(storage_tex_read, vec2(0)).x;
+    x = f32(textureLoad(storage_tex_read_write, vec2(0)).x);
+    x = textureLoad(color_texture_array_2d, vec2(0), 0, 0).x;
+    x = f32(textureLoad(color_texture_array_cube, vec3(0), 0, 0).x);
     return x;
 }
 

diff --git a/wgsl_to_wgpu/src/wgsl.rs b/wgsl_to_wgpu/src/wgsl.rs
@@ -183,6 +183,10 @@ pub fn rust_type(module: &naga::Module, ty: &naga::Type, format: MatrixVectorTyp
         naga::TypeInner::BindingArray { base: _, size: _ } => todo!(),
         naga::TypeInner::AccelerationStructure => todo!(),
         naga::TypeInner::RayQuery => todo!(),
+        naga::TypeInner::Array {
+            size: naga::ArraySize::Pending(_),
+            ..
+        } => todo!(),
     }
 }