Merge pull request #30 from LykenSol/rust-gpu-update

Update to EmbarkStudios/rust-gpu@320bc05.

Author: bcata6

Cargo.lock

@@ -17,11 +17,29 @@ winit = { version = "0.23", features = ["web-sys"] }
 wgpu-subscriber = "0.1.0"
 
 [build-dependencies]
-spirv-builder = { version = "*", default-features = false }
+spirv-builder = { version = "0.3.0-alpha.0", default-features = false }
 
 [workspace]
 members = ["shaders"]
 
 [patch.crates-io]
-spirv-builder = { git = "https://github.com/EmbarkStudios/rust-gpu", rev = "c1dc273e706fa0e09a651131e1adee39bd49c2b2" }
-spirv-std = { git = "https://github.com/EmbarkStudios/rust-gpu", rev = "c1dc273e706fa0e09a651131e1adee39bd49c2b2" }
+spirv-builder = { git = "https://github.com/EmbarkStudios/rust-gpu", rev = "320bc0562682afc8afb51ca928d22a39edd6f00b" }
+spirv-std = { git = "https://github.com/EmbarkStudios/rust-gpu", rev = "320bc0562682afc8afb51ca928d22a39edd6f00b" }
+
+# Compile build-dependencies in release mode with
+# the same settings as regular dependencies.
+[profile.release.build-override]
+opt-level = 3
+codegen-units = 16
+
+# HACK(eddyb) also compile debug mode's build-dependencies with optimizations,
+# because otherwise `rustc_codegen_spirv` (esspecially its linker) is too slow.
+# Also `spirv-opt` *alone* takes (just) over an hour to run, though this only
+# brings it down only to 10 minutes, so I've disabled it below, for now.
+[profile.dev.build-override]
+opt-level = 3
+
+# HACK(eddyb) don't optimize the shader crate, to avoid `spirv-opt` taking
+# a long time (10 minutes if itself was optimized, over an hour otherwise).
+[profile.release.package."shadertoys-shaders"]
+opt-level = 0

Cargo.toml

@@ -1 +1,9 @@
-nightly-2020-11-24
+# If you see this, run `rustup self update` to get rustup 1.23 or newer.
+
+# NOTE: above comment is for older `rustup` (before TOML support was added),
+# which will treat the first line as the toolchain name, and therefore show it
+# to the user in the error, instead of "error: invalid channel name '[toolchain]'".
+
+[toolchain]
+channel = "nightly-2020-12-28"
+components = ["rust-src", "rustc-dev", "llvm-tools-preview"]

rust-toolchain

@@ -8,5 +8,5 @@ edition = "2018"
 crate-type = ["dylib"]
 
 [dependencies]
-spirv-std = "*"
+spirv-std = "0.3.0-alpha.0"
 shared = { path = "../shared" }

setup.bat

@@ -81,7 +81,9 @@ fn noise2(x: Vec2) -> f32 {
     let mut f: Vec2 = x.gl_fract();
     f = f * f * (Vec2::splat(3.0) - 2.0 * f);
     let n: f32 = p.x + p.y * 157.0;
-    let h: Vec4 = hash4(Vec4::splat(n) + vec4(NC0.x, NC0.y, NC1.x, NC1.y));
+    let nc0 = NC0;
+    let nc1 = NC1;
+    let h: Vec4 = hash4(Vec4::splat(n) + vec4(nc0.x, nc0.y, nc1.x, nc1.y));
     let s1: Vec2 = mix(h.xy(), h.zw(), f.xx());
     mix(s1.x, s1.y, f.y)
 }

setup.sh

@@ -5,4 +5,4 @@ authors = []
 edition = "2018"
 
 [dependencies]
-spirv-std = "*"
+spirv-std = "0.3.0-alpha.0"