shaderc 1.6 -> 0.7

3 years ago · 1f9024691c
parent 63af8ac3d5
commit 1f9024691c
83 changed files with 31 additions and 31 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@ -2861,9 +2861,9 @@ dependencies = [

 [[package]]
 name = "shaderc"
-version = "0.6.2"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed344938df2d7fa3cc6bfb4af0b578f00f9b389d5fe7be0250fa657c442a8281"
+checksum = "03f0cb8d1f8667fc9c50d5054be830a117af5f9a15f87c66b72bbca0c2fca484"
 dependencies = [
 "libc",
 "shaderc-sys",
@ -2871,9 +2871,9 @@ dependencies = [

 [[package]]
 name = "shaderc-sys"
-version = "0.6.2"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30075c712b08798cb2b5e54e4434970a4a3a3a3e838b0642590c74605d3cc528"
+checksum = "c89175f80244b82f882033a81bd188f87307c4c39b2fe8d0f194314f270bdea9"
 dependencies = [
 "cmake",
 "libc",
--- a/code/beginner/tutorial1-window/Cargo.toml
+++ b/code/beginner/tutorial1-window/Cargo.toml
@ -14,7 +14,7 @@ path = "src/main.rs"
 [dependencies]
 image = "0.23"
 winit = "0.22"
-shaderc = "0.6"
+shaderc = "0.7"
 cgmath = "0.17"
 env_logger = "0.7"
 log = "0.4"
--- a/code/beginner/tutorial2-swapchain/Cargo.toml
+++ b/code/beginner/tutorial2-swapchain/Cargo.toml
@ -9,7 +9,7 @@ edition = "2018"
 [dependencies]
 image = "0.23"
 winit = "0.22"
-shaderc = "0.6"
+shaderc = "0.7"
 cgmath = "0.17"
 env_logger = "0.7"
 log = "0.4"
--- a/code/beginner/tutorial3-pipeline/Cargo.toml
+++ b/code/beginner/tutorial3-pipeline/Cargo.toml
@ -7,7 +7,7 @@ edition = "2018"
 [dependencies]
 image = "0.23"
 winit = "0.22"
-# shaderc = "0.6" # REMOVED!
+# shaderc = "0.7" # REMOVED!
 cgmath = "0.17"
 env_logger = "0.7"
 log = "0.4"
@ -16,7 +16,7 @@ futures = "0.3"

 # NEW!
 [build-dependencies]
-shaderc = "0.6"
+shaderc = "0.7"
 glob = "0.3"
 fs_extra = "1.2"
 anyhow = "1.0"
--- a/code/beginner/tutorial3-pipeline/src/challenge.frag.spv
+++ b/code/beginner/tutorial3-pipeline/src/challenge.frag.spv
--- a/code/beginner/tutorial3-pipeline/src/challenge.vert.spv
+++ b/code/beginner/tutorial3-pipeline/src/challenge.vert.spv
--- a/code/beginner/tutorial3-pipeline/src/shader.frag.spv
+++ b/code/beginner/tutorial3-pipeline/src/shader.frag.spv
--- a/code/beginner/tutorial3-pipeline/src/shader.vert.spv
+++ b/code/beginner/tutorial3-pipeline/src/shader.vert.spv
--- a/code/beginner/tutorial4-buffer/Cargo.toml
+++ b/code/beginner/tutorial4-buffer/Cargo.toml
@ -20,7 +20,7 @@ bytemuck = { version = "1.4", features = [ "derive" ] }
 anyhow = "1.0"
 fs_extra = "1.2"
 glob = "0.3"
-shaderc = "0.6"
+shaderc = "0.7"

 [[bin]]
 name = "tutorial4-buffer"
--- a/code/beginner/tutorial4-buffer/src/shader.frag.spv
+++ b/code/beginner/tutorial4-buffer/src/shader.frag.spv
--- a/code/beginner/tutorial4-buffer/src/shader.vert.spv
+++ b/code/beginner/tutorial4-buffer/src/shader.vert.spv
--- a/code/beginner/tutorial5-textures/Cargo.toml
+++ b/code/beginner/tutorial5-textures/Cargo.toml
@ -21,7 +21,7 @@ winit = "0.22"
 anyhow = "1.0"
 fs_extra = "1.2"
 glob = "0.3"
-shaderc = "0.6"
+shaderc = "0.7"

 [[bin]]
 name = "tutorial5-textures"
--- a/code/beginner/tutorial5-textures/src/shader.frag.spv
+++ b/code/beginner/tutorial5-textures/src/shader.frag.spv
--- a/code/beginner/tutorial5-textures/src/shader.vert.spv
+++ b/code/beginner/tutorial5-textures/src/shader.vert.spv
--- a/code/beginner/tutorial6-uniforms/Cargo.toml
+++ b/code/beginner/tutorial6-uniforms/Cargo.toml
@ -19,7 +19,7 @@ winit = "0.22"
 anyhow = "1.0"
 fs_extra = "1.2"
 glob = "0.3"
-shaderc = "0.6"
+shaderc = "0.7"

 [[bin]]
 name = "tutorial6-uniforms"
--- a/code/beginner/tutorial6-uniforms/src/shader.frag.spv
+++ b/code/beginner/tutorial6-uniforms/src/shader.frag.spv
--- a/code/beginner/tutorial6-uniforms/src/shader.vert.spv
+++ b/code/beginner/tutorial6-uniforms/src/shader.vert.spv
--- a/code/beginner/tutorial7-instancing/Cargo.toml
+++ b/code/beginner/tutorial7-instancing/Cargo.toml
@ -19,7 +19,7 @@ winit = "0.22"
 anyhow = "1.0"
 fs_extra = "1.2"
 glob = "0.3"
-shaderc = "0.6"
+shaderc = "0.7"

 [[bin]]
 name = "tutorial7-instancing"
--- a/code/beginner/tutorial7-instancing/src/challenge.vert.spv
+++ b/code/beginner/tutorial7-instancing/src/challenge.vert.spv
--- a/code/beginner/tutorial7-instancing/src/shader.frag.spv
+++ b/code/beginner/tutorial7-instancing/src/shader.frag.spv
--- a/code/beginner/tutorial7-instancing/src/shader.vert.spv
+++ b/code/beginner/tutorial7-instancing/src/shader.vert.spv
--- a/code/beginner/tutorial8-depth/Cargo.toml
+++ b/code/beginner/tutorial8-depth/Cargo.toml
@ -19,7 +19,7 @@ winit = "0.22"
 anyhow = "1.0"
 fs_extra = "1.2"
 glob = "0.3"
-shaderc = "0.6"
+shaderc = "0.7"

 [[bin]]
 name = "tutorial8-depth"
--- a/code/beginner/tutorial8-depth/src/challenge.frag.spv
+++ b/code/beginner/tutorial8-depth/src/challenge.frag.spv
--- a/code/beginner/tutorial8-depth/src/challenge.vert.spv
+++ b/code/beginner/tutorial8-depth/src/challenge.vert.spv
--- a/code/beginner/tutorial8-depth/src/shader.frag.spv
+++ b/code/beginner/tutorial8-depth/src/shader.frag.spv
--- a/code/beginner/tutorial8-depth/src/shader.vert.spv
+++ b/code/beginner/tutorial8-depth/src/shader.vert.spv
--- a/code/beginner/tutorial9-models/Cargo.toml
+++ b/code/beginner/tutorial9-models/Cargo.toml
@ -20,7 +20,7 @@ winit = "0.22"
 anyhow = "1.0"
 fs_extra = "1.2"
 glob = "0.3"
-shaderc = "0.6"
+shaderc = "0.7"

 [[bin]]
 name = "tutorial9-models"
--- a/code/beginner/tutorial9-models/src/shader.frag.spv
+++ b/code/beginner/tutorial9-models/src/shader.frag.spv
--- a/code/beginner/tutorial9-models/src/shader.vert.spv
+++ b/code/beginner/tutorial9-models/src/shader.vert.spv
--- a/code/intermediate/tutorial10-lighting/Cargo.toml
+++ b/code/intermediate/tutorial10-lighting/Cargo.toml
@ -20,7 +20,7 @@ winit = "0.22"
 anyhow = "1.0"
 fs_extra = "1.2"
 glob = "0.3"
-shaderc = "0.6"
+shaderc = "0.7"

 [[bin]]
 name = "tutorial10-lighting"
--- a/code/intermediate/tutorial10-lighting/src/light.frag.spv
+++ b/code/intermediate/tutorial10-lighting/src/light.frag.spv
--- a/code/intermediate/tutorial10-lighting/src/light.vert.spv
+++ b/code/intermediate/tutorial10-lighting/src/light.vert.spv
--- a/code/intermediate/tutorial10-lighting/src/phong.frag.spv
+++ b/code/intermediate/tutorial10-lighting/src/phong.frag.spv
--- a/code/intermediate/tutorial10-lighting/src/shader.frag.spv
+++ b/code/intermediate/tutorial10-lighting/src/shader.frag.spv
--- a/code/intermediate/tutorial10-lighting/src/shader.vert.spv
+++ b/code/intermediate/tutorial10-lighting/src/shader.vert.spv
--- a/code/intermediate/tutorial11-normals/Cargo.toml
+++ b/code/intermediate/tutorial11-normals/Cargo.toml
@ -20,7 +20,7 @@ winit = "0.22"
 anyhow = "1.0"
 fs_extra = "1.2"
 glob = "0.3"
-shaderc = "0.6"
+shaderc = "0.7"

 [[bin]]
 name = "tutorial11-normals"
--- a/code/intermediate/tutorial11-normals/src/light.frag.spv
+++ b/code/intermediate/tutorial11-normals/src/light.frag.spv
--- a/code/intermediate/tutorial11-normals/src/light.vert.spv
+++ b/code/intermediate/tutorial11-normals/src/light.vert.spv
--- a/code/intermediate/tutorial11-normals/src/shader-wrong.vert.spv
+++ b/code/intermediate/tutorial11-normals/src/shader-wrong.vert.spv
--- a/code/intermediate/tutorial11-normals/src/shader.frag.spv
+++ b/code/intermediate/tutorial11-normals/src/shader.frag.spv
--- a/code/intermediate/tutorial11-normals/src/shader.vert.spv
+++ b/code/intermediate/tutorial11-normals/src/shader.vert.spv
--- a/code/intermediate/tutorial11-normals/src/world_space.frag.spv
+++ b/code/intermediate/tutorial11-normals/src/world_space.frag.spv
--- a/code/intermediate/tutorial11-normals/src/world_space.vert.spv
+++ b/code/intermediate/tutorial11-normals/src/world_space.vert.spv
--- a/code/intermediate/tutorial12-camera/Cargo.toml
+++ b/code/intermediate/tutorial12-camera/Cargo.toml
@ -20,4 +20,4 @@ winit = "0.23"
 anyhow = "1.0"
 fs_extra = "1.2"
 glob = "0.3"
-shaderc = "0.6"
+shaderc = "0.7"
--- a/code/intermediate/tutorial12-camera/src/light.frag.spv
+++ b/code/intermediate/tutorial12-camera/src/light.frag.spv
--- a/code/intermediate/tutorial12-camera/src/light.vert.spv
+++ b/code/intermediate/tutorial12-camera/src/light.vert.spv
--- a/code/intermediate/tutorial12-camera/src/shader.frag.spv
+++ b/code/intermediate/tutorial12-camera/src/shader.frag.spv
--- a/code/intermediate/tutorial12-camera/src/shader.vert.spv
+++ b/code/intermediate/tutorial12-camera/src/shader.vert.spv
--- a/code/intermediate/tutorial13-threading/Cargo.toml
+++ b/code/intermediate/tutorial13-threading/Cargo.toml
@ -22,4 +22,4 @@ anyhow = "1.0"
 fs_extra = "1.2"
 glob = "0.3"
 rayon = "1.4" # NEW!
-shaderc = "0.6"
+shaderc = "0.7"
--- a/code/intermediate/tutorial13-threading/src/light.frag.spv
+++ b/code/intermediate/tutorial13-threading/src/light.frag.spv
--- a/code/intermediate/tutorial13-threading/src/light.vert.spv
+++ b/code/intermediate/tutorial13-threading/src/light.vert.spv
--- a/code/intermediate/tutorial13-threading/src/shader.frag.spv
+++ b/code/intermediate/tutorial13-threading/src/shader.frag.spv
--- a/code/intermediate/tutorial13-threading/src/shader.vert.spv
+++ b/code/intermediate/tutorial13-threading/src/shader.vert.spv
--- a/code/research/performance/Cargo.toml
+++ b/code/research/performance/Cargo.toml
@ -20,7 +20,7 @@ version = "0.17"
 features = ["swizzle"]

 [build-dependencies]
-shaderc = "0.6"
+shaderc = "0.7"
 glob = "0.3"
 failure = "0.1"
 fs_extra = "1.1"
--- a/code/research/performance/src/blit.frag.spv
+++ b/code/research/performance/src/blit.frag.spv
--- a/code/research/performance/src/blit.vert.spv
+++ b/code/research/performance/src/blit.vert.spv
--- a/code/research/performance/src/default.frag.spv
+++ b/code/research/performance/src/default.frag.spv
--- a/code/research/performance/src/light.frag.spv
+++ b/code/research/performance/src/light.frag.spv
--- a/code/research/performance/src/light.vert.spv
+++ b/code/research/performance/src/light.vert.spv
--- a/code/research/performance/src/shader.frag.spv
+++ b/code/research/performance/src/shader.frag.spv
--- a/code/research/performance/src/shader.vert.spv
+++ b/code/research/performance/src/shader.vert.spv
--- a/code/showcase/compute/Cargo.toml
+++ b/code/showcase/compute/Cargo.toml
@ -22,4 +22,4 @@ anyhow = "1.0"
 fs_extra = "1.2"
 glob = "0.3"
 rayon = "1.4"
-shaderc = "0.6"
+shaderc = "0.7"
--- a/code/showcase/compute/src/light.frag.spv
+++ b/code/showcase/compute/src/light.frag.spv
--- a/code/showcase/compute/src/light.vert.spv
+++ b/code/showcase/compute/src/light.vert.spv
--- a/code/showcase/compute/src/model_load.comp.spv
+++ b/code/showcase/compute/src/model_load.comp.spv
--- a/code/showcase/compute/src/shader.frag.spv
+++ b/code/showcase/compute/src/shader.frag.spv
--- a/code/showcase/compute/src/shader.vert.spv
+++ b/code/showcase/compute/src/shader.vert.spv
--- a/code/showcase/framework/Cargo.toml
+++ b/code/showcase/framework/Cargo.toml
@ -22,5 +22,5 @@ winit = "0.23"
 anyhow = "1.0"
 fs_extra = "1.2"
 glob = "0.3"
-shaderc = "0.6"
+shaderc = "0.7"
 rayon = "1.5"
--- a/code/showcase/framework/src/shader_canvas.frag.spv
+++ b/code/showcase/framework/src/shader_canvas.frag.spv
--- a/code/showcase/framework/src/shader_canvas.vert.spv
+++ b/code/showcase/framework/src/shader_canvas.vert.spv
--- a/code/showcase/gifs/Cargo.toml
+++ b/code/showcase/gifs/Cargo.toml
@ -24,4 +24,4 @@ framework = { version = "0.1.0", path = "../framework" }
 anyhow = "1.0"
 fs_extra = "1.2"
 glob = "0.3"
-shaderc = "0.6"
+shaderc = "0.7"
--- a/code/showcase/gifs/src/shader.frag.spv
+++ b/code/showcase/gifs/src/shader.frag.spv
--- a/code/showcase/gifs/src/shader.vert.spv
+++ b/code/showcase/gifs/src/shader.vert.spv
--- a/code/showcase/instancing/Cargo.toml
+++ b/code/showcase/instancing/Cargo.toml
@ -20,4 +20,4 @@ winit = "0.22"
 anyhow = "1.0"
 fs_extra = "1.2"
 glob = "0.3"
-shaderc = "0.6"
+shaderc = "0.7"
--- a/code/showcase/instancing/src/light.frag.spv
+++ b/code/showcase/instancing/src/light.frag.spv
--- a/code/showcase/instancing/src/light.vert.spv
+++ b/code/showcase/instancing/src/light.vert.spv
--- a/code/showcase/instancing/src/shader.frag.spv
+++ b/code/showcase/instancing/src/shader.frag.spv
--- a/code/showcase/instancing/src/shader.vert.spv
+++ b/code/showcase/instancing/src/shader.vert.spv
--- a/code/showcase/pong/Cargo.toml
+++ b/code/showcase/pong/Cargo.toml
@ -6,7 +6,7 @@ edition = "2018"

 [dependencies]
 winit = "0.22"
-shaderc = "0.6"
+shaderc = "0.7"
 anyhow = "1.0"
 bytemuck = { version = "1.4", features = [ "derive" ] }
 cgmath = "0.17"
@ -20,4 +20,4 @@ rodio = "0.11"
 anyhow = "1.0"
 fs_extra = "1.2"
 glob = "0.3"
-shaderc = "0.6"
+shaderc = "0.7"
--- a/code/showcase/windowless/Cargo.toml
+++ b/code/showcase/windowless/Cargo.toml
@ -10,7 +10,7 @@ edition = "2018"
 image = "0.22"
 raw-window-handle = "0.1"
 winit = "0.20.0-alpha3"
-shaderc = "0.6"
+shaderc = "0.7"
 cgmath = "0.17"
 wgpu = "0.5.0"
 futures = "0.3.4"
--- a/docs/beginner/tutorial1-window/README.md
+++ b/docs/beginner/tutorial1-window/README.md
@ -10,7 +10,7 @@ For the beginner stuff, we're going to keep things very simple, we'll add things
 [dependencies]
 image = "0.23"
 winit = "0.22"
-shaderc = "0.6"
+shaderc = "0.7"
 cgmath = "0.17"
 env_logger = "0.7"
 log = "0.4"
--- a/docs/beginner/tutorial3-pipeline/README.md
+++ b/docs/beginner/tutorial3-pipeline/README.md
@ -27,7 +27,7 @@ In order to do that, we're going to need something to do the conversion. Add the
 ```toml
 [dependencies]
 # ...
-shaderc = "0.6"
+shaderc = "0.7"
 ```

 We'll use this in a bit, but first let's create the shaders.
@ -277,7 +277,7 @@ We'll start writing code in it in a bit. First we need to add some things to our
 [dependencies]
 image = "0.23"
 winit = "0.22"
-# shaderc = "0.6" # REMOVED!
+# shaderc = "0.7" # REMOVED!
 cgmath = "0.17"
 wgpu = "0.6"
 futures = "0.3"
@ -287,7 +287,7 @@ futures = "0.3"
 anyhow = "1.0"
 fs_extra = "1.1"
 glob = "0.3"
-shaderc = "0.6"
+shaderc = "0.7"
 ```

 We've removed shaderc from our dependencies and added a new `[build-depencies]` block. These are dependencies for our build script. We know about shaderc, but the other ones are meant to simplify dealing with the file system and dealing with rust errors.
--- a/docs/intermediate/tutorial13-threading/README.md
+++ b/docs/intermediate/tutorial13-threading/README.md
@ -34,7 +34,7 @@ anyhow = "1.0"
 fs_extra = "1.2"
 glob = "0.3"
 rayon = "1.4" # NEW!
-shaderc = "0.6"
+shaderc = "0.7"
 ```

 First some housekeeping. Our `build.rs` code currently uses an array to store the globs to find our projects shaders. We're going to switch to using a `Vec` to make things play nicer with `rayon`.