Upgrade to a lightly non-standard rust-gpu

Author: DJMcNab

rust-gpu-toy/Cargo.lock

@@ -12,7 +12,7 @@ winit = "0.25"
 pollster = "0.2"
 async-executor = "1.0"
 bytemuck = "1.6.3"
-spirv-builder = { git = "https://github.com/EmbarkStudios/rust-gpu", rev = "c4eb7af88ee0baf556cc6b46389a2e71b34919bf", features = [
+spirv-builder = { git = "https://github.com/DJMcNab/rust-gpu", rev = "c5bb9ebcf90a6bef3d9f11f79d3d33414f36091f", features = [
     "watch",
 ] }
 rust-gpu-toy-shared = { path = "./shared" }

rust-gpu-toy/Cargo.toml

@@ -10,7 +10,7 @@ edition = "2018"
 crate-type = ["dylib"]
 
 [dependencies]
-spirv-std = { git = "https://github.com/EmbarkStudios/rust-gpu", rev = "c4eb7af88ee0baf556cc6b46389a2e71b34919bf", features = [
+spirv-std = { git = "https://github.com/DJMcNab/rust-gpu", rev = "c5bb9ebcf90a6bef3d9f11f79d3d33414f36091f", features = [
     "glam",
 ] }
 rust-gpu-toy-shared = { path = "../shared" }

rust-gpu-toy/shaders/Cargo.toml

@@ -19,10 +19,9 @@ use spirv_std::{
 #[spirv(compute(threads(16, 16)))]
 pub fn main(
     #[spirv(push_constant)] config: &Config,
-    #[spirv(descriptor_set = 0, binding = 0, storage_buffer)] output_buffer: &image::Image!(2D, format=rgba8, sampled=false),
+    #[spirv(descriptor_set = 0, binding = 0, non_readable)] output_buffer: &image::Image!(2D, format=rgba8, sampled=false),
     #[spirv(global_invocation_id)] global_ix: UVec3,
 ) {
-    asm!();
     let frag_coord = global_ix.truncate().as_vec2()
         / vec2(config.width as f32, config.height as f32)
         - vec2(0.5, 0.5);

rust-gpu-toy/shaders/src/lib.rs

@@ -315,7 +315,19 @@ impl State {
     fn render_frame(&self) {
         let frame = match self.surface.get_current_texture() {
             Ok(output) => output,
-            Err(_) => todo!(),
+            Err(err) => {
+                eprintln!("get_current_texture error: {:?}", err);
+                match err {
+                    wgpu::SurfaceError::Lost => {
+                        self.surface.configure(&self.device, &self.surface_config);
+                    }
+                    wgpu::SurfaceError::OutOfMemory => {
+                        panic!();
+                    }
+                    _ => (),
+                }
+                return;
+            }
         };
         let frame_view = frame
             .texture
@@ -355,6 +367,7 @@ impl State {
             rpass.draw(0..3, 0..2);
         }
         self.queue.submit(Some(encoder.finish()));
+        frame.present();
     }
 }