nordic-dev.net/wgpu
nordic-dev.net/wgpu
2
0
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2024-10-30 14:01:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update naga to gfx-20

Browse Source
This commit is contained in:
Dzmitry Malyshau 2021-04-04 11:15:55 -04:00
parent 8a0bb3327a
commit 0bd8526239
3 changed files with 23 additions and 24 deletions
Show Stats 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=3c98acc515c22c8e1d78bbfaf16fc7201326e109#3c98acc515c22c8e1d78bbfaf16fc7201326e109"
source = "git+https://github.com/gfx-rs/gfx?rev=99e75efbe6ca95c2ad3eecf49cfb8474a17050df#99e75efbe6ca95c2ad3eecf49cfb8474a17050df"
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=3c98acc515c22c8e1d78bbfaf16fc7201326e109#3c98acc515c22c8e1d78bbfaf16fc7201326e109"
source = "git+https://github.com/gfx-rs/gfx?rev=99e75efbe6ca95c2ad3eecf49cfb8474a17050df#99e75efbe6ca95c2ad3eecf49cfb8474a17050df"
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=3c98acc515c22c8e1d78bbfaf16fc7201326e109#3c98acc515c22c8e1d78bbfaf16fc7201326e109"
source = "git+https://github.com/gfx-rs/gfx?rev=99e75efbe6ca95c2ad3eecf49cfb8474a17050df#99e75efbe6ca95c2ad3eecf49cfb8474a17050df"
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=3c98acc515c22c8e1d78bbfaf16fc7201326e109#3c98acc515c22c8e1d78bbfaf16fc7201326e109"
source = "git+https://github.com/gfx-rs/gfx?rev=99e75efbe6ca95c2ad3eecf49cfb8474a17050df#99e75efbe6ca95c2ad3eecf49cfb8474a17050df"
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=3c98acc515c22c8e1d78bbfaf16fc7201326e109#3c98acc515c22c8e1d78bbfaf16fc7201326e109"
source = "git+https://github.com/gfx-rs/gfx?rev=99e75efbe6ca95c2ad3eecf49cfb8474a17050df#99e75efbe6ca95c2ad3eecf49cfb8474a17050df"
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=3c98acc515c22c8e1d78bbfaf16fc7201326e109#3c98acc515c22c8e1d78bbfaf16fc7201326e109"
source = "git+https://github.com/gfx-rs/gfx?rev=99e75efbe6ca95c2ad3eecf49cfb8474a17050df#99e75efbe6ca95c2ad3eecf49cfb8474a17050df"
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=3c98acc515c22c8e1d78bbfaf16fc7201326e109#3c98acc515c22c8e1d78bbfaf16fc7201326e109"
source = "git+https://github.com/gfx-rs/gfx?rev=99e75efbe6ca95c2ad3eecf49cfb8474a17050df#99e75efbe6ca95c2ad3eecf49cfb8474a17050df"
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=3c98acc515c22c8e1d78bbfaf16fc7201326e109#3c98acc515c22c8e1d78bbfaf16fc7201326e109"
source = "git+https://github.com/gfx-rs/gfx?rev=99e75efbe6ca95c2ad3eecf49cfb8474a17050df#99e75efbe6ca95c2ad3eecf49cfb8474a17050df"
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-19#80a8243953f93c5265ed20cd2bca85bc336fe355"
source = "git+https://github.com/gfx-rs/naga?tag=gfx-20#0369ee181ed9cd315635fc0e3d99deecdbc72246"
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=3c98acc515c22c8e1d78bbfaf16fc7201326e109#3c98acc515c22c8e1d78bbfaf16fc7201326e109"
source = "git+https://github.com/gfx-rs/gfx?rev=99e75efbe6ca95c2ad3eecf49cfb8474a17050df#99e75efbe6ca95c2ad3eecf49cfb8474a17050df"
[[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 = "3c98acc515c22c8e1d78bbfaf16fc7201326e109" }
gfx-backend-empty = { git = "https://github.com/gfx-rs/gfx", rev = "3c98acc515c22c8e1d78bbfaf16fc7201326e109" }
hal = { package = "gfx-hal", git = "https://github.com/gfx-rs/gfx", rev = "99e75efbe6ca95c2ad3eecf49cfb8474a17050df" }
gfx-backend-empty = { git = "https://github.com/gfx-rs/gfx", rev = "99e75efbe6ca95c2ad3eecf49cfb8474a17050df" }
[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 = "3c98acc515c22c8e1d78bbfaf16fc7201326e109", features = ["naga"] }
gfx-backend-gl = { git = "https://github.com/gfx-rs/gfx", rev = "3c98acc515c22c8e1d78bbfaf16fc7201326e109" }
gfx-backend-vulkan = { git = "https://github.com/gfx-rs/gfx", rev = "99e75efbe6ca95c2ad3eecf49cfb8474a17050df", features = ["naga"] }
gfx-backend-gl = { git = "https://github.com/gfx-rs/gfx", rev = "99e75efbe6ca95c2ad3eecf49cfb8474a17050df" }
[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 = "3c98acc515c22c8e1d78bbfaf16fc7201326e109" }
gfx-backend-vulkan = { git = "https://github.com/gfx-rs/gfx", rev = "3c98acc515c22c8e1d78bbfaf16fc7201326e109", optional = true }
gfx-backend-metal = { git = "https://github.com/gfx-rs/gfx", rev = "99e75efbe6ca95c2ad3eecf49cfb8474a17050df" }
gfx-backend-vulkan = { git = "https://github.com/gfx-rs/gfx", rev = "99e75efbe6ca95c2ad3eecf49cfb8474a17050df", optional = true }
[target.'cfg(all(not(target_arch = "wasm32"), windows))'.dependencies]
gfx-backend-dx12 = { git = "https://github.com/gfx-rs/gfx", rev = "3c98acc515c22c8e1d78bbfaf16fc7201326e109" }
gfx-backend-dx11 = { git = "https://github.com/gfx-rs/gfx", rev = "3c98acc515c22c8e1d78bbfaf16fc7201326e109" }
gfx-backend-vulkan = { git = "https://github.com/gfx-rs/gfx", rev = "3c98acc515c22c8e1d78bbfaf16fc7201326e109", features = ["naga"] }
gfx-backend-dx12 = { git = "https://github.com/gfx-rs/gfx", rev = "99e75efbe6ca95c2ad3eecf49cfb8474a17050df" }
gfx-backend-dx11 = { git = "https://github.com/gfx-rs/gfx", rev = "99e75efbe6ca95c2ad3eecf49cfb8474a17050df" }
gfx-backend-vulkan = { git = "https://github.com/gfx-rs/gfx", rev = "99e75efbe6ca95c2ad3eecf49cfb8474a17050df", features = ["naga"] }
[target.'cfg(target_arch = "wasm32")'.dependencies]
gfx-backend-gl = { git = "https://github.com/gfx-rs/gfx", rev = "3c98acc515c22c8e1d78bbfaf16fc7201326e109" }
gfx-backend-gl = { git = "https://github.com/gfx-rs/gfx", rev = "99e75efbe6ca95c2ad3eecf49cfb8474a17050df" }
[dependencies.naga]
git = "https://github.com/gfx-rs/naga"
tag = "gfx-19"
tag = "gfx-20"
features = ["spv-in", "spv-out", "wgsl-in"]
[dependencies.wgt]

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

@ -326,9 +326,8 @@ impl<B: GfxBackend> Device<B> {
let spv_options = {
use naga::back::spv;
let mut flags = spv::WriterFlags::empty();
if cfg!(debug_assertions) {
flags |= spv::WriterFlags::DEBUG;
}
flags.set(spv::WriterFlags::DEBUG, cfg!(debug_assertions));
//Note: we don't adjust the coordinate space, because `NDC_Y_UP` is required.
spv::Options {
lang_version: (1, 0),
capabilities: [