From 02aa740f728187f9206ee499c459abf17ea36c18 Mon Sep 17 00:00:00 2001 From: Isse Date: Thu, 18 Jan 2024 01:19:55 +0100 Subject: [PATCH] try fix changing settings for opengl + windows --- Cargo.lock | 10 +++++----- Cargo.toml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d1361e411b..61a0a1838b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3609,7 +3609,7 @@ dependencies = [ [[package]] name = "naga" version = "0.14.2" -source = "git+https://github.com/IsseW/wgpu?rev=96dc8b317#96dc8b317a5ac9280f642f2de8082b8e8ddd66a1" +source = "git+https://github.com/IsseW/wgpu?rev=5ea160164#5ea16016402bb83b4ccd7ac8e6d4b0a2f85da6a0" dependencies = [ "bit-set", "bitflags 2.4.0", @@ -7871,7 +7871,7 @@ dependencies = [ [[package]] name = "wgpu" version = "0.18.0" -source = "git+https://github.com/IsseW/wgpu?rev=96dc8b317#96dc8b317a5ac9280f642f2de8082b8e8ddd66a1" +source = "git+https://github.com/IsseW/wgpu?rev=5ea160164#5ea16016402bb83b4ccd7ac8e6d4b0a2f85da6a0" dependencies = [ "arrayvec", "cfg-if 1.0.0", @@ -7896,7 +7896,7 @@ dependencies = [ [[package]] name = "wgpu-core" version = "0.18.1" -source = "git+https://github.com/IsseW/wgpu?rev=96dc8b317#96dc8b317a5ac9280f642f2de8082b8e8ddd66a1" +source = "git+https://github.com/IsseW/wgpu?rev=5ea160164#5ea16016402bb83b4ccd7ac8e6d4b0a2f85da6a0" dependencies = [ "arrayvec", "bit-vec", @@ -7920,7 +7920,7 @@ dependencies = [ [[package]] name = "wgpu-hal" version = "0.18.1" -source = "git+https://github.com/IsseW/wgpu?rev=96dc8b317#96dc8b317a5ac9280f642f2de8082b8e8ddd66a1" +source = "git+https://github.com/IsseW/wgpu?rev=5ea160164#5ea16016402bb83b4ccd7ac8e6d4b0a2f85da6a0" dependencies = [ "android_system_properties", "arrayvec", @@ -7972,7 +7972,7 @@ dependencies = [ [[package]] name = "wgpu-types" version = "0.18.0" -source = "git+https://github.com/IsseW/wgpu?rev=96dc8b317#96dc8b317a5ac9280f642f2de8082b8e8ddd66a1" +source = "git+https://github.com/IsseW/wgpu?rev=5ea160164#5ea16016402bb83b4ccd7ac8e6d4b0a2f85da6a0" dependencies = [ "bitflags 2.4.0", "js-sys", diff --git a/Cargo.toml b/Cargo.toml index 4c54099f05..d39712dcf9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -164,7 +164,7 @@ ntapi = { git = "https://github.com/MSxDOS/ntapi.git", rev = "9f56b149c9e2579673 shred = { git = "https://github.com/amethyst/shred.git", rev = "5d52c6fc390dd04c12158633e77591f6523d1f85" } # This is needed because of an issue with spirv & naga in wgpu 0.18, and there's an issue # with uint in uniforms for gl. -wgpu = { git = "https://github.com/IsseW/wgpu", rev = "96dc8b317" } +wgpu = { git = "https://github.com/IsseW/wgpu", rev = "5ea160164" } # [patch."https://github.com/gfx-rs/gfx"] # gfx-hal = { git = "https://github.com/Imberflur/gfx.git", tag = "veloren-fixes-v1" }