diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2020-01-24 15:51:51 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-24 15:51:51 -0500 |
| commit | 60238afa6ce1aa9078908b5fefd5426f48a9911b (patch) | |
| tree | 63d519cba6c2722669e146da726a20d04fdb4e8c | |
| parent | 0bd995cdf5a67b5121f143848e68e1b60ea589bf (diff) | |
| parent | 1979e67f700cab7196ca7e1e99e338ce74096126 (diff) | |
| download | servo-60238afa6ce1aa9078908b5fefd5426f48a9911b.tar.gz servo-60238afa6ce1aa9078908b5fefd5426f48a9911b.zip | |
Auto merge of #25592 - pshaughn:spirvcross_rebase, r=Manishearth
change branch of spirv_cross
Hopefully fixes #25991
| -rw-r--r-- | Cargo.lock | 2 | ||||
| -rw-r--r-- | Cargo.toml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Cargo.lock b/Cargo.lock index 8e6dc6e6473..0a3b71daf20 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5550,7 +5550,7 @@ dependencies = [ [[package]] name = "spirv_cross" version = "0.16.0" -source = "git+https://github.com/kvark/spirv_cross?branch=wgpu#636677bad724797789239c16e6d332e9b4d97b86" +source = "git+https://github.com/servo/spirv_cross?branch=wgpu-servo#636677bad724797789239c16e6d332e9b4d97b86" dependencies = [ "cc", ] diff --git a/Cargo.toml b/Cargo.toml index 20f04f7cc20..253038351bd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -30,5 +30,5 @@ opt-level = 3 mio = { git = "https://github.com/servo/mio.git", branch = "servo" } # https://github.com/retep998/winapi-rs/pull/816 winapi = { git = "https://github.com/servo/winapi-rs", branch = "patch-1" } -spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu" } +spirv_cross = { git = "https://github.com/servo/spirv_cross", branch = "wgpu-servo" } backtrace = { git = "https://github.com/MeFisto94/backtrace-rs", branch = "fix-strtab-freeing-crash" } |