github/wgpu
1
1
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2026-04-22 03:02:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge #1296

Browse Source 
1296: Update gfx to the MSL entry point fix r=kvark a=kvark

See https://github.com/gfx-rs/gfx/pull/3705

Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
This commit is contained in:
bors[bot]
2021-03-31 01:26:36 +00:00
committed by GitHub
parent be16c7f2f2 49c59ec063
commit 41f106d7fc
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Cargo.lock generated
View File

@@ -465,7 +465,7 @@ dependencies = [
[[package]]
name = "gfx-auxil"
version = "0.8.0"
source = "git+https://github.com/gfx-rs/gfx?rev=ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569#ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569"
source = "git+https://github.com/gfx-rs/gfx?rev=d002952029facee7aafd52c94230057df6dd298f#d002952029facee7aafd52c94230057df6dd298f"
dependencies = [
"fxhash",
"gfx-hal",
@@ -475,7 +475,7 @@ dependencies = [
[[package]]
name = "gfx-backend-dx11"
version = "0.7.0"
source = "git+https://github.com/gfx-rs/gfx?rev=ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569#ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569"
source = "git+https://github.com/gfx-rs/gfx?rev=d002952029facee7aafd52c94230057df6dd298f#d002952029facee7aafd52c94230057df6dd298f"
dependencies = [
"arrayvec",
"bitflags",
@@ -496,7 +496,7 @@ dependencies = [
[[package]]
name = "gfx-backend-dx12"
version = "0.7.0"
source = "git+https://github.com/gfx-rs/gfx?rev=ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569#ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569"
source = "git+https://github.com/gfx-rs/gfx?rev=d002952029facee7aafd52c94230057df6dd298f#d002952029facee7aafd52c94230057df6dd298f"
dependencies = [
"arrayvec",
"bit-set",
@@ -517,7 +517,7 @@ dependencies = [
[[package]]
name = "gfx-backend-empty"
version = "0.7.0"
source = "git+https://github.com/gfx-rs/gfx?rev=ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569#ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569"
source = "git+https://github.com/gfx-rs/gfx?rev=d002952029facee7aafd52c94230057df6dd298f#d002952029facee7aafd52c94230057df6dd298f"
dependencies = [
"gfx-hal",
"log",
@@ -527,7 +527,7 @@ dependencies = [
[[package]]
name = "gfx-backend-gl"
version = "0.7.0"
source = "git+https://github.com/gfx-rs/gfx?rev=ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569#ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569"
source = "git+https://github.com/gfx-rs/gfx?rev=d002952029facee7aafd52c94230057df6dd298f#d002952029facee7aafd52c94230057df6dd298f"
dependencies = [
"arrayvec",
"bitflags",
@@ -550,7 +550,7 @@ dependencies = [
[[package]]
name = "gfx-backend-metal"
version = "0.7.0"
source = "git+https://github.com/gfx-rs/gfx?rev=ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569#ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569"
source = "git+https://github.com/gfx-rs/gfx?rev=d002952029facee7aafd52c94230057df6dd298f#d002952029facee7aafd52c94230057df6dd298f"
dependencies = [
"arrayvec",
"bitflags",
@@ -575,7 +575,7 @@ dependencies = [
[[package]]
name = "gfx-backend-vulkan"
version = "0.7.0"
source = "git+https://github.com/gfx-rs/gfx?rev=ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569#ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569"
source = "git+https://github.com/gfx-rs/gfx?rev=d002952029facee7aafd52c94230057df6dd298f#d002952029facee7aafd52c94230057df6dd298f"
dependencies = [
"arrayvec",
"ash",
@@ -595,7 +595,7 @@ dependencies = [
[[package]]
name = "gfx-hal"
version = "0.7.0"
source = "git+https://github.com/gfx-rs/gfx?rev=ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569#ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569"
source = "git+https://github.com/gfx-rs/gfx?rev=d002952029facee7aafd52c94230057df6dd298f#d002952029facee7aafd52c94230057df6dd298f"
dependencies = [
"bitflags",
"naga",
@@ -1171,7 +1171,7 @@ dependencies = [
[[package]]
name = "range-alloc"
version = "0.1.2"
source = "git+https://github.com/gfx-rs/gfx?rev=ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569#ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569"
source = "git+https://github.com/gfx-rs/gfx?rev=d002952029facee7aafd52c94230057df6dd298f#d002952029facee7aafd52c94230057df6dd298f"
[[package]]
name = "raw-window-handle"

20
wgpu-core/Cargo.toml
View File

@@ -40,24 +40,24 @@ thiserror = "1"
gpu-alloc = { git = "https://github.com/zakarumych/gpu-alloc.git", rev = "560ad651aa8f7aefcee8f5bcf41e67a84561bcda" }
gpu-descriptor = { version = "0.1" }
hal = { package = "gfx-hal", git = "https://github.com/gfx-rs/gfx", rev = "ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569" }
gfx-backend-empty = { git = "https://github.com/gfx-rs/gfx", rev = "ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569" }
hal = { package = "gfx-hal", git = "https://github.com/gfx-rs/gfx", rev = "d002952029facee7aafd52c94230057df6dd298f" }
gfx-backend-empty = { git = "https://github.com/gfx-rs/gfx", rev = "d002952029facee7aafd52c94230057df6dd298f" }
[target.'cfg(all(not(target_arch = "wasm32"), all(unix, not(target_os = "ios"), not(target_os = "macos"))))'.dependencies]
gfx-backend-vulkan = { git = "https://github.com/gfx-rs/gfx", rev = "ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569", features = ["naga"] }
gfx-backend-gl = { git = "https://github.com/gfx-rs/gfx", rev = "ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569" }
gfx-backend-vulkan = { git = "https://github.com/gfx-rs/gfx", rev = "d002952029facee7aafd52c94230057df6dd298f", features = ["naga"] }
gfx-backend-gl = { git = "https://github.com/gfx-rs/gfx", rev = "d002952029facee7aafd52c94230057df6dd298f" }
[target.'cfg(all(not(target_arch = "wasm32"), any(target_os = "ios", target_os = "macos")))'.dependencies]
gfx-backend-metal = { git = "https://github.com/gfx-rs/gfx", rev = "ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569" }
gfx-backend-vulkan = { git = "https://github.com/gfx-rs/gfx", rev = "ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569", optional = true }
gfx-backend-metal = { git = "https://github.com/gfx-rs/gfx", rev = "d002952029facee7aafd52c94230057df6dd298f" }
gfx-backend-vulkan = { git = "https://github.com/gfx-rs/gfx", rev = "d002952029facee7aafd52c94230057df6dd298f", optional = true }
[target.'cfg(all(not(target_arch = "wasm32"), windows))'.dependencies]
gfx-backend-dx12 = { git = "https://github.com/gfx-rs/gfx", rev = "ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569" }
gfx-backend-dx11 = { git = "https://github.com/gfx-rs/gfx", rev = "ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569" }
gfx-backend-vulkan = { git = "https://github.com/gfx-rs/gfx", rev = "ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569", features = ["naga"] }
gfx-backend-dx12 = { git = "https://github.com/gfx-rs/gfx", rev = "d002952029facee7aafd52c94230057df6dd298f" }
gfx-backend-dx11 = { git = "https://github.com/gfx-rs/gfx", rev = "d002952029facee7aafd52c94230057df6dd298f" }
gfx-backend-vulkan = { git = "https://github.com/gfx-rs/gfx", rev = "d002952029facee7aafd52c94230057df6dd298f", features = ["naga"] }
[target.'cfg(target_arch = "wasm32")'.dependencies]
gfx-backend-gl = { git = "https://github.com/gfx-rs/gfx", rev = "ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569" }
gfx-backend-gl = { git = "https://github.com/gfx-rs/gfx", rev = "d002952029facee7aafd52c94230057df6dd298f" }
[dependencies.naga]
git = "https://github.com/gfx-rs/naga"