Update to newer rust-gpu

Author: LegNeato

Cargo.lock

@@ -32,8 +32,8 @@ spirv-builder.workspace = true
 members = ["shaders", "shared"]
 
 [workspace.dependencies]
-spirv-builder = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "96fcc9dbe475921997050c25c02a62c7a12d48e0", default-features = false }
-spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "96fcc9dbe475921997050c25c02a62c7a12d48e0" }
+spirv-builder = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "ddb039b9c97e1c9bbed19c6386f4d1dc9230911b", default-features = false }
+spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "ddb039b9c97e1c9bbed19c6386f4d1dc9230911b" }
 
 # Compile build-dependencies in release mode with
 # the same settings as regular dependencies.

Cargo.toml

@@ -1,9 +1,10 @@
-use spirv_builder::{MetadataPrintout, SpirvBuilder};
+use spirv_builder::{SpirvBuilder, SpirvMetadata};
 use std::error::Error;
 
 fn build_shader(path_to_crate: &str) -> Result<(), Box<dyn Error>> {
-    let builder = SpirvBuilder::new(path_to_crate, "spirv-unknown-vulkan1.2")
-        .print_metadata(MetadataPrintout::Full);
+    let mut builder = SpirvBuilder::new(path_to_crate, "spirv-unknown-vulkan1.2")
+        .spirv_metadata(SpirvMetadata::Full);
+    builder.build_script.env_shader_spv_path = Some(true);
 
     let _result = builder.build()?;
     Ok(())

build.rs

@@ -1,3 +1,3 @@
 [toolchain]
-channel = "nightly-2025-06-30"
+channel = "nightly-2026-04-02"
 components = ["rust-src", "rustc-dev", "llvm-tools"]

rust-toolchain.toml

@@ -153,7 +153,7 @@ impl Inputs {
 
         // drag your mouse to apply circle inversion
         if ms.y != -2.0 && ms.w > -2.0 {
-            uv = inversion(uv, 60.0.to_radians().cos());
+            uv = inversion(uv, 60.0_f32.to_radians().cos());
             ci = ms.xy();
         }
 

shaders/src/a_question_of_time.rs

@@ -240,7 +240,7 @@ impl State {
 
     pub fn main_image(&mut self, frag_color: &mut Vec4, frag_coord: Vec2) {
         let aspect_ratio: Vec2 = vec2(self.inputs.resolution.x / self.inputs.resolution.y, 1.0);
-        let fov: f32 = 45.0.to_radians().tan();
+        let fov: f32 = 45.0_f32.to_radians().tan();
         let point_ndc: Vec2 = frag_coord / self.inputs.resolution.xy();
         let point_cam: Vec3 = ((2.0 * point_ndc - Vec2::ONE) * aspect_ratio * fov).extend(-1.0);
 

shaders/src/atmosphere_system_test.rs

@@ -1,7 +1,6 @@
 //! Ported to Rust from https://github.com/Tw1ddle/Sky-Shader/blob/master/src/shaders/glsl/sky.fragment
 
 #![cfg_attr(target_arch = "spirv", no_std)]
-#![feature(asm_experimental_arch)]
 
 use bytemuck::{Pod, Zeroable};
 use core::f32::consts::PI;

shared/src/lib.rs

@@ -1,5 +1,6 @@
 use futures::executor::block_on;
 use ouroboros::self_referencing;
+use shared::ShaderConstants;
 use std::error::Error;
 use std::time::Instant;
 use wgpu::{self, InstanceDescriptor};
@@ -10,7 +11,6 @@ use winit::event::{ElementState, MouseButton, WindowEvent};
 use winit::event_loop::{ActiveEventLoop, ControlFlow, EventLoop};
 use winit::keyboard::NamedKey;
 use winit::window::{Window, WindowAttributes, WindowId};
-use shared::ShaderConstants;
 
 #[self_referencing]
 struct WindowSurface {
@@ -110,7 +110,10 @@ impl ShaderToyApp {
         const MAX_PUSH_CONSTANT_SIZE: u32 = {
             let v = size_of::<ShaderConstants>();
             // Not sure if this is portable on Metal or DX12 in the first place...
-            assert!(v <= 128, "Push constant larger than the minimum that Vulkan requires, may not be portable!");
+            assert!(
+                v <= 128,
+                "Push constant larger than the minimum that Vulkan requires, may not be portable!"
+            );
             v as u32
         };
         let required_limits = wgpu::Limits {
@@ -302,26 +305,32 @@ impl ApplicationHandler for ShaderToyApp {
                     self.drag_end_y = self.cursor_y;
                 }
             }
-            WindowEvent::MouseInput { state, button, .. } => {
-                if button == MouseButton::Left {
-                    self.mouse_left_pressed = state == ElementState::Pressed;
-                    if self.mouse_left_pressed {
-                        self.drag_start_x = self.cursor_x;
-                        self.drag_start_y = self.cursor_y;
-                        self.drag_end_x = self.cursor_x;
-                        self.drag_end_y = self.cursor_y;
-                        self.mouse_left_clicked = true;
-                    }
+            WindowEvent::MouseInput {
+                state,
+                button: MouseButton::Left,
+                ..
+            } => {
+                self.mouse_left_pressed = state == ElementState::Pressed;
+                if self.mouse_left_pressed {
+                    self.drag_start_x = self.cursor_x;
+                    self.drag_start_y = self.cursor_y;
+                    self.drag_end_x = self.cursor_x;
+                    self.drag_end_y = self.cursor_y;
+                    self.mouse_left_clicked = true;
                 }
             }
-            WindowEvent::MouseWheel { delta: winit::event::MouseScrollDelta::LineDelta(x, y), .. } => {
+            WindowEvent::MouseWheel {
+                delta: winit::event::MouseScrollDelta::LineDelta(x, y),
+                ..
+            } => {
                 self.drag_end_x = x * 0.1;
                 self.drag_end_y = y * 0.1;
             }
-            WindowEvent::KeyboardInput { event, .. } => {
-                if event.logical_key == NamedKey::Escape && event.state == ElementState::Pressed {
-                    self.close_requested = true;
-                }
+            WindowEvent::KeyboardInput { event, .. }
+                if event.logical_key == NamedKey::Escape
+                    && event.state == ElementState::Pressed =>
+            {
+                self.close_requested = true;
             }
             WindowEvent::RedrawRequested => self.render(),
             _ => {}