try fix changing settings for opengl + windows

This commit is contained in:
Isse 2024-01-18 01:19:55 +01:00 committed by Marcel Märtens
parent b7a56e895a
commit 02aa740f72
2 changed files with 6 additions and 6 deletions

10
Cargo.lock generated
View File

@ -3609,7 +3609,7 @@ dependencies = [
[[package]] [[package]]
name = "naga" name = "naga"
version = "0.14.2" 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 = [ dependencies = [
"bit-set", "bit-set",
"bitflags 2.4.0", "bitflags 2.4.0",
@ -7871,7 +7871,7 @@ dependencies = [
[[package]] [[package]]
name = "wgpu" name = "wgpu"
version = "0.18.0" 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 = [ dependencies = [
"arrayvec", "arrayvec",
"cfg-if 1.0.0", "cfg-if 1.0.0",
@ -7896,7 +7896,7 @@ dependencies = [
[[package]] [[package]]
name = "wgpu-core" name = "wgpu-core"
version = "0.18.1" 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 = [ dependencies = [
"arrayvec", "arrayvec",
"bit-vec", "bit-vec",
@ -7920,7 +7920,7 @@ dependencies = [
[[package]] [[package]]
name = "wgpu-hal" name = "wgpu-hal"
version = "0.18.1" 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 = [ dependencies = [
"android_system_properties", "android_system_properties",
"arrayvec", "arrayvec",
@ -7972,7 +7972,7 @@ dependencies = [
[[package]] [[package]]
name = "wgpu-types" name = "wgpu-types"
version = "0.18.0" 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 = [ dependencies = [
"bitflags 2.4.0", "bitflags 2.4.0",
"js-sys", "js-sys",

View File

@ -164,7 +164,7 @@ ntapi = { git = "https://github.com/MSxDOS/ntapi.git", rev = "9f56b149c9e2579673
shred = { git = "https://github.com/amethyst/shred.git", rev = "5d52c6fc390dd04c12158633e77591f6523d1f85" } 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 # 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. # 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"] # [patch."https://github.com/gfx-rs/gfx"]
# gfx-hal = { git = "https://github.com/Imberflur/gfx.git", tag = "veloren-fixes-v1" } # gfx-hal = { git = "https://github.com/Imberflur/gfx.git", tag = "veloren-fixes-v1" }