From 6233db8682c4b480a5468d0523947ba342dcef57 Mon Sep 17 00:00:00 2001 From: Awkor <2327050-Awkor@users.noreply.gitlab.com> Date: Sun, 10 Jul 2022 21:46:30 +0200 Subject: [PATCH] Bump shaderc version to 0.8.0 --- Cargo.lock | 24 ++++++++++++++++++++---- voxygen/Cargo.toml | 2 +- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6f7a3ca6d3..a632387b23 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4916,6 +4916,15 @@ dependencies = [ "petgraph 0.5.1", ] +[[package]] +name = "roxmltree" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "921904a62e410e37e215c40381b7117f830d9d89ba60ab5236170541dd25646b" +dependencies = [ + "xmlparser", +] + [[package]] name = "rstar" version = "0.9.2" @@ -5363,9 +5372,9 @@ dependencies = [ [[package]] name = "shaderc" -version = "0.6.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50b8aeaae10b9bda5cba66736a7e265f67698e912e1cc6a4678acba286e22be9" +checksum = "80e6fe602a861622769530a23bc40bfba31adbf186d0c8412e83f5519c5d6bee" dependencies = [ "libc", "shaderc-sys", @@ -5373,12 +5382,13 @@ dependencies = [ [[package]] name = "shaderc-sys" -version = "0.6.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b12d7c62d6732884c9dfab587503fa3a795b108df152415a89da23812d4737e" +checksum = "3794498651f8173d0afbc0bb8aca45ced111098227e755dde4c0ef2888c8d0bf" dependencies = [ "cmake", "libc", + "roxmltree", ] [[package]] @@ -7875,6 +7885,12 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3" +[[package]] +name = "xmlparser" +version = "0.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "114ba2b24d2167ef6d67d7d04c8cc86522b87f490025f39f0303b7db5bf5e3d8" + [[package]] name = "yasna" version = "0.5.0" diff --git a/voxygen/Cargo.toml b/voxygen/Cargo.toml index c6b4ca7b61..ddf0292050 100644 --- a/voxygen/Cargo.toml +++ b/voxygen/Cargo.toml @@ -58,7 +58,7 @@ winit = {version = "0.25.0", features = ["serde"]} wgpu = { version = "=0.8.0", features = ["trace", "cross"] } wgpu-profiler = { git = "https://github.com/Imberflur/wgpu-profiler", tag = "wgpu-0.8" } bytemuck = { version="1.4", features=["derive"] } -shaderc = "0.6.2" +shaderc = "0.8.0" # cmake crate used by shaderc, newer version 0.1.46 uses a new cmake command that is not available in our CI cmake version # see https://github.com/alexcrichton/cmake-rs/issues/131 cmake = "=0.1.45"