From 2664da88b0c7e5090a4f6d40dea834ae79005560 Mon Sep 17 00:00:00 2001 From: Nicolas Silva Date: Mon, 9 Oct 2023 18:39:22 +0200 Subject: [PATCH] Update `naga` to 0.13.0@git:3c7dbc4016b84a35c69b30305b12abaeefc21fd9 (#4221) --- Cargo.lock | 2 +- Cargo.toml | 2 +- wgpu-core/Cargo.toml | 2 +- wgpu-core/src/validation.rs | 1 + wgpu-hal/Cargo.toml | 4 ++-- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fd2aac5896..227ae963ba 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1686,7 +1686,7 @@ dependencies = [ [[package]] name = "naga" version = "0.13.0" -source = "git+https://github.com/gfx-rs/naga?rev=6668d0694cc51ee66c71c2ca3a1ab1081956299b#6668d0694cc51ee66c71c2ca3a1ab1081956299b" +source = "git+https://github.com/gfx-rs/naga?rev=3c7dbc4016b84a35c69b30305b12abaeefc21fd9#3c7dbc4016b84a35c69b30305b12abaeefc21fd9" dependencies = [ "bit-set", "bitflags 2.4.0", diff --git a/Cargo.toml b/Cargo.toml index 9a9e11cf4b..1f330d8934 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -51,7 +51,7 @@ version = "0.17" [workspace.dependencies.naga] git = "https://github.com/gfx-rs/naga" -rev = "6668d0694cc51ee66c71c2ca3a1ab1081956299b" +rev = "3c7dbc4016b84a35c69b30305b12abaeefc21fd9" version = "0.13.0" [workspace.dependencies] diff --git a/wgpu-core/Cargo.toml b/wgpu-core/Cargo.toml index 6c0a3172d6..87b15552be 100644 --- a/wgpu-core/Cargo.toml +++ b/wgpu-core/Cargo.toml @@ -77,7 +77,7 @@ thiserror = "1" [dependencies.naga] git = "https://github.com/gfx-rs/naga" -rev = "6668d0694cc51ee66c71c2ca3a1ab1081956299b" +rev = "3c7dbc4016b84a35c69b30305b12abaeefc21fd9" version = "0.13.0" features = ["clone", "span", "validate"] diff --git a/wgpu-core/src/validation.rs b/wgpu-core/src/validation.rs index 59793743f7..d512dd3245 100644 --- a/wgpu-core/src/validation.rs +++ b/wgpu-core/src/validation.rs @@ -350,6 +350,7 @@ fn map_storage_format_from_naga(format: naga::StorageFormat) -> wgt::TextureForm Sf::Rgba8Snorm => Tf::Rgba8Snorm, Sf::Rgba8Uint => Tf::Rgba8Uint, Sf::Rgba8Sint => Tf::Rgba8Sint, + Sf::Bgra8Unorm => Tf::Bgra8Unorm, Sf::Rgb10a2Uint => Tf::Rgb10a2Uint, Sf::Rgb10a2Unorm => Tf::Rgb10a2Unorm, diff --git a/wgpu-hal/Cargo.toml b/wgpu-hal/Cargo.toml index bb1ac205fa..0d984022ea 100644 --- a/wgpu-hal/Cargo.toml +++ b/wgpu-hal/Cargo.toml @@ -120,14 +120,14 @@ android_system_properties = "0.1.1" [dependencies.naga] git = "https://github.com/gfx-rs/naga" -rev = "6668d0694cc51ee66c71c2ca3a1ab1081956299b" +rev = "3c7dbc4016b84a35c69b30305b12abaeefc21fd9" version = "0.13.0" features = ["clone"] # DEV dependencies [dev-dependencies.naga] git = "https://github.com/gfx-rs/naga" -rev = "6668d0694cc51ee66c71c2ca3a1ab1081956299b" +rev = "3c7dbc4016b84a35c69b30305b12abaeefc21fd9" version = "0.13.0" features = ["wgsl-in"]