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 #1294

Browse Source 
1294: Update naga to gfx-19 r=kvark a=Gordon-F

Just a naga update. Also fix https://github.com/gfx-rs/wgpu/issues/1293.

Co-authored-by: Gordon-F <ishaposhnik@icloud.com>
This commit is contained in:
bors[bot]
2021-03-30 23:34:59 +00:00
committed by GitHub
parent 569f87ebda 7fc70bf349
commit be16c7f2f2
3 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
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=2ac006f7fe86f32dd5b5e07f9daf44cd876a66f0#2ac006f7fe86f32dd5b5e07f9daf44cd876a66f0"
source = "git+https://github.com/gfx-rs/gfx?rev=ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569#ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569"
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=2ac006f7fe86f32dd5b5e07f9daf44cd876a66f0#2ac006f7fe86f32dd5b5e07f9daf44cd876a66f0"
source = "git+https://github.com/gfx-rs/gfx?rev=ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569#ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569"
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=2ac006f7fe86f32dd5b5e07f9daf44cd876a66f0#2ac006f7fe86f32dd5b5e07f9daf44cd876a66f0"
source = "git+https://github.com/gfx-rs/gfx?rev=ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569#ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569"
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=2ac006f7fe86f32dd5b5e07f9daf44cd876a66f0#2ac006f7fe86f32dd5b5e07f9daf44cd876a66f0"
source = "git+https://github.com/gfx-rs/gfx?rev=ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569#ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569"
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=2ac006f7fe86f32dd5b5e07f9daf44cd876a66f0#2ac006f7fe86f32dd5b5e07f9daf44cd876a66f0"
source = "git+https://github.com/gfx-rs/gfx?rev=ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569#ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569"
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=2ac006f7fe86f32dd5b5e07f9daf44cd876a66f0#2ac006f7fe86f32dd5b5e07f9daf44cd876a66f0"
source = "git+https://github.com/gfx-rs/gfx?rev=ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569#ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569"
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=2ac006f7fe86f32dd5b5e07f9daf44cd876a66f0#2ac006f7fe86f32dd5b5e07f9daf44cd876a66f0"
source = "git+https://github.com/gfx-rs/gfx?rev=ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569#ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569"
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=2ac006f7fe86f32dd5b5e07f9daf44cd876a66f0#2ac006f7fe86f32dd5b5e07f9daf44cd876a66f0"
source = "git+https://github.com/gfx-rs/gfx?rev=ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569#ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569"
dependencies = [
"bitflags",
"naga",
@@ -916,7 +916,7 @@ dependencies = [
[[package]]
name = "naga"
version = "0.3.1"
source = "git+https://github.com/gfx-rs/naga?tag=gfx-18#e87f57d82c44b12fe0288d876b050e9ddd1d6e1b"
source = "git+https://github.com/gfx-rs/naga?tag=gfx-19#80a8243953f93c5265ed20cd2bca85bc336fe355"
dependencies = [
"bit-set",
"bitflags",
@@ -1171,7 +1171,7 @@ dependencies = [
[[package]]
name = "range-alloc"
version = "0.1.2"
source = "git+https://github.com/gfx-rs/gfx?rev=2ac006f7fe86f32dd5b5e07f9daf44cd876a66f0#2ac006f7fe86f32dd5b5e07f9daf44cd876a66f0"
source = "git+https://github.com/gfx-rs/gfx?rev=ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569#ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569"
[[package]]
name = "raw-window-handle"

22
wgpu-core/Cargo.toml
View File

@@ -40,28 +40,28 @@ 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 = "2ac006f7fe86f32dd5b5e07f9daf44cd876a66f0" }
gfx-backend-empty = { git = "https://github.com/gfx-rs/gfx", rev = "2ac006f7fe86f32dd5b5e07f9daf44cd876a66f0" }
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" }
[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 = "2ac006f7fe86f32dd5b5e07f9daf44cd876a66f0", features = ["naga"] }
gfx-backend-gl = { git = "https://github.com/gfx-rs/gfx", rev = "2ac006f7fe86f32dd5b5e07f9daf44cd876a66f0" }
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" }
[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 = "2ac006f7fe86f32dd5b5e07f9daf44cd876a66f0" }
gfx-backend-vulkan = { git = "https://github.com/gfx-rs/gfx", rev = "2ac006f7fe86f32dd5b5e07f9daf44cd876a66f0", optional = true }
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 }
[target.'cfg(all(not(target_arch = "wasm32"), windows))'.dependencies]
gfx-backend-dx12 = { git = "https://github.com/gfx-rs/gfx", rev = "2ac006f7fe86f32dd5b5e07f9daf44cd876a66f0" }
gfx-backend-dx11 = { git = "https://github.com/gfx-rs/gfx", rev = "2ac006f7fe86f32dd5b5e07f9daf44cd876a66f0" }
gfx-backend-vulkan = { git = "https://github.com/gfx-rs/gfx", rev = "2ac006f7fe86f32dd5b5e07f9daf44cd876a66f0", features = ["naga"] }
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"] }
[target.'cfg(target_arch = "wasm32")'.dependencies]
gfx-backend-gl = { git = "https://github.com/gfx-rs/gfx", rev = "2ac006f7fe86f32dd5b5e07f9daf44cd876a66f0" }
gfx-backend-gl = { git = "https://github.com/gfx-rs/gfx", rev = "ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569" }
[dependencies.naga]
git = "https://github.com/gfx-rs/naga"
tag = "gfx-18"
tag = "gfx-19"
features = ["spv-in", "spv-out", "wgsl-in"]
[dependencies.wgt]

1
wgpu-core/src/device/mod.rs
View File

@@ -1033,6 +1033,7 @@ impl<B: GfxBackend> Device<B> {
let naga_result = if desc
.flags
.contains(wgt::ShaderFlags::EXPERIMENTAL_TRANSLATION)
|| !cfg!(feature = "cross")
{
match unsafe { self.raw.create_shader_module_from_naga(shader) } {
Ok(raw) => Ok(raw),