Merge #1267

1267: Update naga to gfx-15 r=kvark a=kvark **Connections** Fixes #1228 (huge DX12 leak in command allocation) Includes https://github.com/gfx-rs/gfx/pull/3676, https://github.com/gfx-rs/gfx/pull/3679, https://github.com/gfx-rs/gfx/pull/3680, https://github.com/gfx-rs/gfx/pull/3681, and the relevant Naga stuff. **Description** Updates Naga and gfx. **Testing** Tested on wgpu-rs examplse Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
2026-04-22 03:02:01 -04:00 · 2021-03-16 17:07:20 +00:00
parent 82932d1f59 3b1b11f441
commit 5d993efc85
3 changed files with 31 additions and 97 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -56,11 +56,11 @@ dependencies = [

 [[package]]
 name = "ash"
-version = "0.31.0"
+version = "0.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c69a8137596e84c22d57f3da1b5de1d4230b1742a710091c85f4d7ce50f00f38"
+checksum = "77ea56be8250318e64923c7e65b82a35b5c29dfb6dc1c7d1c0b288c4b1bbb084"
 dependencies = [
- "libloading 0.6.5",
+ "libloading 0.7.0",
 ]

 [[package]]
@@ -487,7 +487,7 @@ dependencies = [
 [[package]]
 name = "gfx-auxil"
 version = "0.8.0"
-source = "git+https://github.com/gfx-rs/gfx?rev=cd3042d8c02d9dc7fc74ac8c292099c9789f6d43#cd3042d8c02d9dc7fc74ac8c292099c9789f6d43"
+source = "git+https://github.com/gfx-rs/gfx?rev=2125c1d96b09f97faaa0d7a8a0d1c5315acc8c45#2125c1d96b09f97faaa0d7a8a0d1c5315acc8c45"
 dependencies = [
 "fxhash",
 "gfx-hal",
@@ -497,7 +497,7 @@ dependencies = [
 [[package]]
 name = "gfx-backend-dx11"
 version = "0.7.0"
-source = "git+https://github.com/gfx-rs/gfx?rev=cd3042d8c02d9dc7fc74ac8c292099c9789f6d43#cd3042d8c02d9dc7fc74ac8c292099c9789f6d43"
+source = "git+https://github.com/gfx-rs/gfx?rev=2125c1d96b09f97faaa0d7a8a0d1c5315acc8c45#2125c1d96b09f97faaa0d7a8a0d1c5315acc8c45"
 dependencies = [
 "arrayvec",
 "bitflags",
@@ -518,7 +518,7 @@ dependencies = [
 [[package]]
 name = "gfx-backend-dx12"
 version = "0.7.0"
-source = "git+https://github.com/gfx-rs/gfx?rev=cd3042d8c02d9dc7fc74ac8c292099c9789f6d43#cd3042d8c02d9dc7fc74ac8c292099c9789f6d43"
+source = "git+https://github.com/gfx-rs/gfx?rev=2125c1d96b09f97faaa0d7a8a0d1c5315acc8c45#2125c1d96b09f97faaa0d7a8a0d1c5315acc8c45"
 dependencies = [
 "arrayvec",
 "bit-set",
@@ -532,13 +532,14 @@ dependencies = [
 "raw-window-handle",
 "smallvec",
 "spirv_cross",
+ "thunderdome",
 "winapi 0.3.9",
 ]

 [[package]]
 name = "gfx-backend-empty"
 version = "0.7.0"
-source = "git+https://github.com/gfx-rs/gfx?rev=cd3042d8c02d9dc7fc74ac8c292099c9789f6d43#cd3042d8c02d9dc7fc74ac8c292099c9789f6d43"
+source = "git+https://github.com/gfx-rs/gfx?rev=2125c1d96b09f97faaa0d7a8a0d1c5315acc8c45#2125c1d96b09f97faaa0d7a8a0d1c5315acc8c45"
 dependencies = [
 "gfx-hal",
 "log",
@@ -548,7 +549,7 @@ dependencies = [
 [[package]]
 name = "gfx-backend-gl"
 version = "0.7.0"
-source = "git+https://github.com/gfx-rs/gfx?rev=cd3042d8c02d9dc7fc74ac8c292099c9789f6d43#cd3042d8c02d9dc7fc74ac8c292099c9789f6d43"
+source = "git+https://github.com/gfx-rs/gfx?rev=2125c1d96b09f97faaa0d7a8a0d1c5315acc8c45#2125c1d96b09f97faaa0d7a8a0d1c5315acc8c45"
 dependencies = [
 "arrayvec",
 "bitflags",
@@ -571,7 +572,7 @@ dependencies = [
 [[package]]
 name = "gfx-backend-metal"
 version = "0.7.0"
-source = "git+https://github.com/gfx-rs/gfx?rev=cd3042d8c02d9dc7fc74ac8c292099c9789f6d43#cd3042d8c02d9dc7fc74ac8c292099c9789f6d43"
+source = "git+https://github.com/gfx-rs/gfx?rev=2125c1d96b09f97faaa0d7a8a0d1c5315acc8c45#2125c1d96b09f97faaa0d7a8a0d1c5315acc8c45"
 dependencies = [
 "arrayvec",
 "bitflags",
@@ -596,7 +597,7 @@ dependencies = [
 [[package]]
 name = "gfx-backend-vulkan"
 version = "0.7.0"
-source = "git+https://github.com/gfx-rs/gfx?rev=cd3042d8c02d9dc7fc74ac8c292099c9789f6d43#cd3042d8c02d9dc7fc74ac8c292099c9789f6d43"
+source = "git+https://github.com/gfx-rs/gfx?rev=2125c1d96b09f97faaa0d7a8a0d1c5315acc8c45#2125c1d96b09f97faaa0d7a8a0d1c5315acc8c45"
 dependencies = [
 "arrayvec",
 "ash",
@@ -616,7 +617,7 @@ dependencies = [
 [[package]]
 name = "gfx-hal"
 version = "0.7.0"
-source = "git+https://github.com/gfx-rs/gfx?rev=cd3042d8c02d9dc7fc74ac8c292099c9789f6d43#cd3042d8c02d9dc7fc74ac8c292099c9789f6d43"
+source = "git+https://github.com/gfx-rs/gfx?rev=2125c1d96b09f97faaa0d7a8a0d1c5315acc8c45#2125c1d96b09f97faaa0d7a8a0d1c5315acc8c45"
 dependencies = [
 "bitflags",
 "naga",
@@ -958,7 +959,7 @@ dependencies = [
 [[package]]
 name = "naga"
 version = "0.3.1"
-source = "git+https://github.com/gfx-rs/naga?tag=gfx-14#32a11752af99e818b14da9aa37c914a89b57b7ad"
+source = "git+https://github.com/gfx-rs/naga?tag=gfx-15#196523de7820d4907a14bd22517c4d572d26b0be"
 dependencies = [
 "bit-set",
 "bitflags",
@@ -1224,7 +1225,7 @@ dependencies = [
 [[package]]
 name = "range-alloc"
 version = "0.1.2"
-source = "git+https://github.com/gfx-rs/gfx?rev=cd3042d8c02d9dc7fc74ac8c292099c9789f6d43#cd3042d8c02d9dc7fc74ac8c292099c9789f6d43"
+source = "git+https://github.com/gfx-rs/gfx?rev=2125c1d96b09f97faaa0d7a8a0d1c5315acc8c45#2125c1d96b09f97faaa0d7a8a0d1c5315acc8c45"

 [[package]]
 name = "raw-window-handle"
--- a/wgpu-core/Cargo.toml
+++ b/wgpu-core/Cargo.toml
@@ -38,28 +38,28 @@ thiserror = "1"
 gpu-alloc = { version = "0.3", features = ["tracing"] }
 gpu-descriptor = { version = "0.1", features = ["tracing"] }

-hal = { package = "gfx-hal", git = "https://github.com/gfx-rs/gfx", rev = "cd3042d8c02d9dc7fc74ac8c292099c9789f6d43" }
-gfx-backend-empty = { git = "https://github.com/gfx-rs/gfx", rev = "cd3042d8c02d9dc7fc74ac8c292099c9789f6d43" }
+hal = { package = "gfx-hal", git = "https://github.com/gfx-rs/gfx", rev = "2125c1d96b09f97faaa0d7a8a0d1c5315acc8c45" }
+gfx-backend-empty = { git = "https://github.com/gfx-rs/gfx", rev = "2125c1d96b09f97faaa0d7a8a0d1c5315acc8c45" }

 [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 = "cd3042d8c02d9dc7fc74ac8c292099c9789f6d43", features = ["naga"] }
-gfx-backend-gl = { git = "https://github.com/gfx-rs/gfx", rev = "cd3042d8c02d9dc7fc74ac8c292099c9789f6d43" }
+gfx-backend-vulkan = { git = "https://github.com/gfx-rs/gfx", rev = "2125c1d96b09f97faaa0d7a8a0d1c5315acc8c45", features = ["naga"] }
+gfx-backend-gl = { git = "https://github.com/gfx-rs/gfx", rev = "2125c1d96b09f97faaa0d7a8a0d1c5315acc8c45" }

 [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 = "cd3042d8c02d9dc7fc74ac8c292099c9789f6d43" }
-gfx-backend-vulkan = { git = "https://github.com/gfx-rs/gfx", rev = "cd3042d8c02d9dc7fc74ac8c292099c9789f6d43", optional = true }
+gfx-backend-metal = { git = "https://github.com/gfx-rs/gfx", rev = "2125c1d96b09f97faaa0d7a8a0d1c5315acc8c45" }
+gfx-backend-vulkan = { git = "https://github.com/gfx-rs/gfx", rev = "2125c1d96b09f97faaa0d7a8a0d1c5315acc8c45", optional = true }

 [target.'cfg(all(not(target_arch = "wasm32"), windows))'.dependencies]
-gfx-backend-dx12 = { git = "https://github.com/gfx-rs/gfx", rev = "cd3042d8c02d9dc7fc74ac8c292099c9789f6d43" }
-gfx-backend-dx11 = { git = "https://github.com/gfx-rs/gfx", rev = "cd3042d8c02d9dc7fc74ac8c292099c9789f6d43" }
-gfx-backend-vulkan = { git = "https://github.com/gfx-rs/gfx", rev = "cd3042d8c02d9dc7fc74ac8c292099c9789f6d43", features = ["naga"] }
+gfx-backend-dx12 = { git = "https://github.com/gfx-rs/gfx", rev = "2125c1d96b09f97faaa0d7a8a0d1c5315acc8c45" }
+gfx-backend-dx11 = { git = "https://github.com/gfx-rs/gfx", rev = "2125c1d96b09f97faaa0d7a8a0d1c5315acc8c45" }
+gfx-backend-vulkan = { git = "https://github.com/gfx-rs/gfx", rev = "2125c1d96b09f97faaa0d7a8a0d1c5315acc8c45", features = ["naga"] }

 [target.'cfg(target_arch = "wasm32")'.dependencies]
-gfx-backend-gl = { git = "https://github.com/gfx-rs/gfx", rev = "cd3042d8c02d9dc7fc74ac8c292099c9789f6d43" }
+gfx-backend-gl = { git = "https://github.com/gfx-rs/gfx", rev = "2125c1d96b09f97faaa0d7a8a0d1c5315acc8c45" }

 [dependencies.naga]
 git = "https://github.com/gfx-rs/naga"
-tag = "gfx-14"
+tag = "gfx-15"
 features = ["spv-in", "spv-out", "wgsl-in"]

 [dependencies.wgt]
--- a/wgpu-core/src/validation.rs
+++ b/wgpu-core/src/validation.rs
@@ -3,7 +3,7 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

 use crate::{binding_model::BindEntryMap, FastHashMap};
-use naga::proc::analyzer::GlobalUse;
+use naga::proc::{analyzer::GlobalUse, Layouter};
 use std::collections::hash_map::Entry;
 use thiserror::Error;
 use wgt::{BindGroupLayoutEntry, BindingType};
@@ -172,71 +172,6 @@ pub enum StageError {
    },
 }

-fn get_aligned_type_size(
-    module: &naga::Module,
-    handle: naga::Handle<naga::Type>,
-    allow_unbound: bool,
-) -> wgt::BufferAddress {
-    use naga::TypeInner as Ti;
-    //TODO: take alignment into account!
-    match module.types[handle].inner {
-        Ti::Scalar { kind: _, width } => width as wgt::BufferAddress,
-        Ti::Vector {
-            size,
-            kind: _,
-            width,
-        } => size as wgt::BufferAddress * width as wgt::BufferAddress,
-        Ti::Matrix {
-            rows,
-            columns,
-            width,
-        } => {
-            rows as wgt::BufferAddress * columns as wgt::BufferAddress * width as wgt::BufferAddress
-        }
-        Ti::Pointer { .. } => 4,
-        Ti::Array {
-            base,
-            size: naga::ArraySize::Constant(const_handle),
-            stride,
-        } => {
-            let base_size = match stride {
-                Some(stride) => stride.get() as wgt::BufferAddress,
-                None => get_aligned_type_size(module, base, false),
-            };
-            let count = match module.constants[const_handle].inner {
-                naga::ConstantInner::Scalar {
-                    value: naga::ScalarValue::Uint(value),
-                    width: _,
-                } => value,
-                ref other => panic!("Invalid array size constant: {:?}", other),
-            };
-            base_size * count
-        }
-        Ti::Array {
-            base,
-            size: naga::ArraySize::Dynamic,
-            stride,
-        } if allow_unbound => match stride {
-            Some(stride) => stride.get() as wgt::BufferAddress,
-            None => get_aligned_type_size(module, base, false),
-        },
-        Ti::Struct {
-            block: _,
-            ref members,
-        } => {
-            let mut offset = 0;
-            for member in members {
-                offset += match member.span {
-                    Some(span) => span.get() as wgt::BufferAddress,
-                    None => get_aligned_type_size(module, member.ty, false),
-                }
-            }
-            offset
-        }
-        _ => panic!("Unexpected struct field"),
-    }
-}
-
 fn map_storage_format_to_naga(format: wgt::TextureFormat) -> Option<naga::StorageFormat> {
    use naga::StorageFormat as Sf;
    use wgt::TextureFormat as Tf;
@@ -746,6 +681,7 @@ impl Interface {
    }

    pub fn new(module: &naga::Module, analysis: &naga::proc::analyzer::Analysis) -> Self {
+        let layouter = Layouter::new(&module.types, &module.constants);
        let mut resources = naga::Arena::new();
        let mut resource_mapping = FastHashMap::default();
        for (var_handle, var) in module.global_variables.iter() {
@@ -756,15 +692,12 @@ impl Interface {
            let ty = match module.types[var.ty].inner {
                naga::TypeInner::Struct {
                    block: true,
-                    ref members,
+                    members: _,
                } => {
-                    let mut actual_size = 0;
-                    for (i, member) in members.iter().enumerate() {
-                        actual_size +=
-                            get_aligned_type_size(module, member.ty, i + 1 == members.len());
-                    }
+                    //TODO: fix the Naga's resolve to include one element of a dynamic array
+                    let actual_size = layouter.resolve(var.ty).size.max(1);
                    ResourceType::Buffer {
-                        size: wgt::BufferSize::new(actual_size).unwrap(),
+                        size: wgt::BufferSize::new(actual_size as u64).unwrap(),
                    }
                }
                naga::TypeInner::Image {