From 1f9024691c180b842e4d54f4d28c0f35d9564fb5 Mon Sep 17 00:00:00 2001 From: Ben Hansen Date: Tue, 26 Jan 2021 01:59:12 -0700 Subject: [PATCH] shaderc 1.6 -> 0.7 --- Cargo.lock | 8 ++++---- code/beginner/tutorial1-window/Cargo.toml | 2 +- code/beginner/tutorial2-swapchain/Cargo.toml | 2 +- code/beginner/tutorial3-pipeline/Cargo.toml | 4 ++-- .../tutorial3-pipeline/src/challenge.frag.spv | Bin 564 -> 564 bytes .../tutorial3-pipeline/src/challenge.vert.spv | Bin 1264 -> 1264 bytes .../tutorial3-pipeline/src/shader.frag.spv | Bin 452 -> 452 bytes .../tutorial3-pipeline/src/shader.vert.spv | Bin 1164 -> 1164 bytes code/beginner/tutorial4-buffer/Cargo.toml | 2 +- .../tutorial4-buffer/src/shader.frag.spv | Bin 564 -> 564 bytes .../tutorial4-buffer/src/shader.vert.spv | Bin 1048 -> 1048 bytes code/beginner/tutorial5-textures/Cargo.toml | 2 +- .../tutorial5-textures/src/shader.frag.spv | Bin 764 -> 764 bytes .../tutorial5-textures/src/shader.vert.spv | Bin 1096 -> 1096 bytes code/beginner/tutorial6-uniforms/Cargo.toml | 2 +- .../tutorial6-uniforms/src/shader.frag.spv | Bin 764 -> 764 bytes .../tutorial6-uniforms/src/shader.vert.spv | Bin 1384 -> 1384 bytes code/beginner/tutorial7-instancing/Cargo.toml | 2 +- .../src/challenge.vert.spv | Bin 1496 -> 1496 bytes .../tutorial7-instancing/src/shader.frag.spv | Bin 764 -> 764 bytes .../tutorial7-instancing/src/shader.vert.spv | Bin 1496 -> 1496 bytes code/beginner/tutorial8-depth/Cargo.toml | 2 +- .../tutorial8-depth/src/challenge.frag.spv | Bin 1520 -> 1520 bytes .../tutorial8-depth/src/challenge.vert.spv | Bin 1096 -> 1096 bytes .../tutorial8-depth/src/shader.frag.spv | Bin 764 -> 764 bytes .../tutorial8-depth/src/shader.vert.spv | Bin 1496 -> 1496 bytes code/beginner/tutorial9-models/Cargo.toml | 2 +- .../tutorial9-models/src/shader.frag.spv | Bin 764 -> 764 bytes .../tutorial9-models/src/shader.vert.spv | Bin 1496 -> 1496 bytes .../tutorial10-lighting/Cargo.toml | 2 +- .../tutorial10-lighting/src/light.frag.spv | Bin 564 -> 564 bytes .../tutorial10-lighting/src/light.vert.spv | Bin 1840 -> 1840 bytes .../tutorial10-lighting/src/phong.frag.spv | Bin 3196 -> 3196 bytes .../tutorial10-lighting/src/shader.frag.spv | Bin 3196 -> 3196 bytes .../tutorial10-lighting/src/shader.vert.spv | Bin 2272 -> 2272 bytes .../tutorial11-normals/Cargo.toml | 2 +- .../tutorial11-normals/src/light.frag.spv | Bin 564 -> 564 bytes .../tutorial11-normals/src/light.vert.spv | Bin 1840 -> 1840 bytes .../src/shader-wrong.vert.spv | Bin 3560 -> 3560 bytes .../tutorial11-normals/src/shader.frag.spv | Bin 3344 -> 3344 bytes .../tutorial11-normals/src/shader.vert.spv | Bin 3668 -> 3668 bytes .../src/world_space.frag.spv | Bin 3676 -> 3676 bytes .../src/world_space.vert.spv | Bin 3076 -> 3076 bytes .../intermediate/tutorial12-camera/Cargo.toml | 2 +- .../tutorial12-camera/src/light.frag.spv | Bin 564 -> 564 bytes .../tutorial12-camera/src/light.vert.spv | Bin 1840 -> 1840 bytes .../tutorial12-camera/src/shader.frag.spv | Bin 3344 -> 3344 bytes .../tutorial12-camera/src/shader.vert.spv | Bin 3668 -> 3668 bytes .../tutorial13-threading/Cargo.toml | 2 +- .../tutorial13-threading/src/light.frag.spv | Bin 564 -> 564 bytes .../tutorial13-threading/src/light.vert.spv | Bin 1840 -> 1840 bytes .../tutorial13-threading/src/shader.frag.spv | Bin 3344 -> 3344 bytes .../tutorial13-threading/src/shader.vert.spv | Bin 3668 -> 3668 bytes code/research/performance/Cargo.toml | 2 +- code/research/performance/src/blit.frag.spv | Bin 780 -> 780 bytes code/research/performance/src/blit.vert.spv | Bin 1480 -> 1480 bytes .../research/performance/src/default.frag.spv | Bin 420 -> 420 bytes code/research/performance/src/light.frag.spv | Bin 564 -> 564 bytes code/research/performance/src/light.vert.spv | Bin 1928 -> 1928 bytes code/research/performance/src/shader.frag.spv | Bin 3344 -> 3344 bytes code/research/performance/src/shader.vert.spv | Bin 3668 -> 3668 bytes code/showcase/compute/Cargo.toml | 2 +- code/showcase/compute/src/light.frag.spv | Bin 564 -> 564 bytes code/showcase/compute/src/light.vert.spv | Bin 1840 -> 1840 bytes code/showcase/compute/src/model_load.comp.spv | Bin 11352 -> 11352 bytes code/showcase/compute/src/shader.frag.spv | Bin 3344 -> 3344 bytes code/showcase/compute/src/shader.vert.spv | Bin 3668 -> 3668 bytes code/showcase/framework/Cargo.toml | 2 +- .../framework/src/shader_canvas.frag.spv | Bin 1464 -> 1464 bytes .../framework/src/shader_canvas.vert.spv | Bin 1368 -> 1368 bytes code/showcase/gifs/Cargo.toml | 2 +- code/showcase/gifs/src/shader.frag.spv | Bin 452 -> 452 bytes code/showcase/gifs/src/shader.vert.spv | Bin 1164 -> 1164 bytes code/showcase/instancing/Cargo.toml | 2 +- code/showcase/instancing/src/light.frag.spv | Bin 564 -> 564 bytes code/showcase/instancing/src/light.vert.spv | Bin 1840 -> 1840 bytes code/showcase/instancing/src/shader.frag.spv | Bin 3344 -> 3344 bytes code/showcase/instancing/src/shader.vert.spv | Bin 3668 -> 3668 bytes code/showcase/pong/Cargo.toml | 4 ++-- code/showcase/windowless/Cargo.toml | 2 +- docs/beginner/tutorial1-window/README.md | 2 +- docs/beginner/tutorial3-pipeline/README.md | 6 +++--- .../tutorial13-threading/README.md | 2 +- 83 files changed, 31 insertions(+), 31 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 58445cf1..22b7b4a4 100644 --- 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", diff --git a/code/beginner/tutorial1-window/Cargo.toml b/code/beginner/tutorial1-window/Cargo.toml index 381a9235..7ef153c0 100644 --- 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" diff --git a/code/beginner/tutorial2-swapchain/Cargo.toml b/code/beginner/tutorial2-swapchain/Cargo.toml index fc8f1cbf..2b55fb64 100644 --- 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" diff --git a/code/beginner/tutorial3-pipeline/Cargo.toml b/code/beginner/tutorial3-pipeline/Cargo.toml index 36e71032..a3d9a2d2 100644 --- 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" diff --git a/code/beginner/tutorial3-pipeline/src/challenge.frag.spv b/code/beginner/tutorial3-pipeline/src/challenge.frag.spv index 3b896bb4e0971218b78e45cee5068a594edf6901..9578f78508195f7e87b6516b57f9988e37523f94 100644 GIT binary patch delta 18 ZcmdnOvW10{nMs+Qfq{{MYa^#N6967=0-FE; delta 18 ZcmdnOvW10{nMs+Qfq{{MV delta 18 ZcmX@Ye1w^knMs+Qfq{{MVRKnU|?k6+Q`|=0stCt0RKnU|?k6*vQ$;0stCj0<8c5 diff --git a/code/beginner/tutorial4-buffer/Cargo.toml b/code/beginner/tutorial4-buffer/Cargo.toml index f6091f4f..9b28b1ff 100644 --- 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" diff --git a/code/beginner/tutorial4-buffer/src/shader.frag.spv b/code/beginner/tutorial4-buffer/src/shader.frag.spv index d722658da57d192513211ba6748289fbc34f41be..199e2f43156a2c9613b7c9a917c31010239018bc 100644 GIT binary patch delta 18 ZcmdnOvW10{nMs+Qfq{{MYa^#N6967=0-FE; delta 18 ZcmdnOvW10{nMs+Qfq{{MVg? diff --git a/code/beginner/tutorial5-textures/src/shader.vert.spv b/code/beginner/tutorial5-textures/src/shader.vert.spv index befb10bf9a3480bbed971a15b61623f90f91df96..e8fd20889514ff3c26689a500b50ded4ab8a6601 100644 GIT binary patch delta 18 ZcmX@Xae{-BnMs+Qfq{{MYa^#U3jiU&0^tAv delta 18 ZcmX@Xae{-BnMs+Qfq{{MVg? diff --git a/code/beginner/tutorial6-uniforms/src/shader.vert.spv b/code/beginner/tutorial6-uniforms/src/shader.vert.spv index 9f7e47a32d85b6c600700a82ca2e39c0cd52bed6..b8955201508e8a11c172bfb27293e7d4e6904712 100644 GIT binary patch delta 18 ZcmaFC^@59&nMs+Qfq{{MYa?eoD*z^e14aM< delta 18 ZcmaFC^@59&nMs+Qfq{{MVg? diff --git a/code/beginner/tutorial7-instancing/src/shader.vert.spv b/code/beginner/tutorial7-instancing/src/shader.vert.spv index 5c04a076a66e5decbddc232b7f832fac224af0e4..fe23e892d438c868d7418f94afd90d9b28528a14 100644 GIT binary patch delta 18 Zcmcb?eS@2mnMs+Qfq{{MYa{1*Rsbbo1DF5+ delta 18 Zcmcb?eS@2mnMs+Qfq{{MVg? diff --git a/code/beginner/tutorial8-depth/src/shader.vert.spv b/code/beginner/tutorial8-depth/src/shader.vert.spv index 5c04a076a66e5decbddc232b7f832fac224af0e4..fe23e892d438c868d7418f94afd90d9b28528a14 100644 GIT binary patch delta 18 Zcmcb?eS@2mnMs+Qfq{{MYa{1*Rsbbo1DF5+ delta 18 Zcmcb?eS@2mnMs+Qfq{{MVg? diff --git a/code/beginner/tutorial9-models/src/shader.vert.spv b/code/beginner/tutorial9-models/src/shader.vert.spv index 5c04a076a66e5decbddc232b7f832fac224af0e4..fe23e892d438c868d7418f94afd90d9b28528a14 100644 GIT binary patch delta 18 Zcmcb?eS@2mnMs+Qfq{{MYa{1*Rsbbo1DF5+ delta 18 Zcmcb?eS@2mnMs+Qfq{{MVRKnU|?k6+Q|8v8vqRKnU|?k6*vR>t8vqtW+$W>RKnU|?k6+Q`Yw3;-Dq0w@3g delta 18 ZcmeBS>tW+$W>RKnU|?k6*vQGu3;-Dg0ww?e diff --git a/code/research/performance/src/blit.vert.spv b/code/research/performance/src/blit.vert.spv index 8e70d295011568c7020b775f1643e103019ac63e..3db3449aadd79c0f9e46f13d538da61a2fabe610 100644 GIT binary patch delta 18 ZcmX@XeS({lnMs+Qfq{{MYa{1=RsbU*184vM delta 18 ZcmX@XeS({lnMs+Qfq{{MVRKnU|?k6+Q?bY4geaX0RKnU|?k6*vMJW4geaN04gfAF1K9uo delta 18 ZcmcZ+aU+70nMs+Qfq{{MV delta 18 ZcmX@Ye1w^knMs+Qfq{{MVRKnU|?k6+Q`|=0stCt0RKnU|?k6*vQ$;0stCj0<8c5 diff --git a/code/showcase/instancing/Cargo.toml b/code/showcase/instancing/Cargo.toml index a5adbbfc..991b19bc 100644 --- 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" \ No newline at end of file +shaderc = "0.7" \ No newline at end of file diff --git a/code/showcase/instancing/src/light.frag.spv b/code/showcase/instancing/src/light.frag.spv index d722658da57d192513211ba6748289fbc34f41be..199e2f43156a2c9613b7c9a917c31010239018bc 100644 GIT binary patch delta 18 ZcmdnOvW10{nMs+Qfq{{MYa^#N6967=0-FE; delta 18 ZcmdnOvW10{nMs+Qfq{{MV