Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix gl

Browse Source
This commit is contained in:
Isse 2024-01-07 23:51:44 +01:00 committed by Marcel Märtens
parent 165c88bd74
commit 00f527fe8b
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Cargo.lock generated
View File

@ -3636,7 +3636,7 @@ dependencies = [
[[package]]
name = "naga"
version = "0.14.2"
source = "git+https://github.com/gfx-rs/wgpu?rev=daedf03f0617aab6b3ab7380132dc9cb07f62d32#daedf03f0617aab6b3ab7380132dc9cb07f62d32"
source = "git+https://github.com/IsseW/wgpu?rev=96dc8b317#96dc8b317a5ac9280f642f2de8082b8e8ddd66a1"
dependencies = [
"bit-set",
"bitflags 2.4.0",
@ -7898,7 +7898,7 @@ dependencies = [
[[package]]
name = "wgpu"
version = "0.18.0"
source = "git+https://github.com/gfx-rs/wgpu?rev=daedf03f0617aab6b3ab7380132dc9cb07f62d32#daedf03f0617aab6b3ab7380132dc9cb07f62d32"
source = "git+https://github.com/IsseW/wgpu?rev=96dc8b317#96dc8b317a5ac9280f642f2de8082b8e8ddd66a1"
dependencies = [
"arrayvec",
"cfg-if 1.0.0",
@ -7923,7 +7923,7 @@ dependencies = [
[[package]]
name = "wgpu-core"
version = "0.18.1"
source = "git+https://github.com/gfx-rs/wgpu?rev=daedf03f0617aab6b3ab7380132dc9cb07f62d32#daedf03f0617aab6b3ab7380132dc9cb07f62d32"
source = "git+https://github.com/IsseW/wgpu?rev=96dc8b317#96dc8b317a5ac9280f642f2de8082b8e8ddd66a1"
dependencies = [
"arrayvec",
"bit-vec",
@ -7947,7 +7947,7 @@ dependencies = [
[[package]]
name = "wgpu-hal"
version = "0.18.1"
source = "git+https://github.com/gfx-rs/wgpu?rev=daedf03f0617aab6b3ab7380132dc9cb07f62d32#daedf03f0617aab6b3ab7380132dc9cb07f62d32"
source = "git+https://github.com/IsseW/wgpu?rev=96dc8b317#96dc8b317a5ac9280f642f2de8082b8e8ddd66a1"
dependencies = [
"android_system_properties",
"arrayvec",
@ -7999,7 +7999,7 @@ dependencies = [
[[package]]
name = "wgpu-types"
version = "0.18.0"
source = "git+https://github.com/gfx-rs/wgpu?rev=daedf03f0617aab6b3ab7380132dc9cb07f62d32#daedf03f0617aab6b3ab7380132dc9cb07f62d32"
source = "git+https://github.com/IsseW/wgpu?rev=96dc8b317#96dc8b317a5ac9280f642f2de8082b8e8ddd66a1"
dependencies = [
"bitflags 2.4.0",
"js-sys",

4
Cargo.toml
View File

@ -162,7 +162,9 @@ vek = { git = "https://github.com/yoanlcq/vek.git", rev = "84d5cb65841d46599a986
# ntapi 3.7 fails to compile under windows due to the bug https://github.com/MSxDOS/ntapi/pull/12
ntapi = { git = "https://github.com/MSxDOS/ntapi.git", rev = "9f56b149c9e25796739157c0fce3e0007a7de6eb" }
shred = { git = "https://github.com/amethyst/shred.git", rev = "5d52c6fc390dd04c12158633e77591f6523d1f85" }
wgpu = { git = "https://github.com/gfx-rs/wgpu", rev = "daedf03f0617aab6b3ab7380132dc9cb07f62d32" }
# 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" }
# [patch."https://github.com/gfx-rs/gfx"]
# gfx-hal = { git = "https://github.com/Imberflur/gfx.git", tag = "veloren-fixes-v1" }