From 438d6394efd5a41d62c07d18c8fff58dd0243a74 Mon Sep 17 00:00:00 2001 From: Nicolas Silva Date: Tue, 21 Feb 2023 12:50:22 +0100 Subject: [PATCH] Update naga to 0.11.0@git:9742f1616c3e3dd2cc9a5880616fc886c391bb9f (#3512) * Update naga to 0.11.0@git:9742f1616c3e3dd2cc9a5880616fc886c391bb9f * Mark the zero init workgroup test as passing. --- Cargo.lock | 2 +- Cargo.toml | 2 +- wgpu-core/Cargo.toml | 2 +- wgpu-hal/Cargo.toml | 4 ++-- wgpu/tests/shader/zero_init_workgroup_mem.rs | 4 +--- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0ca3b87f2..ed36d2264 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1515,7 +1515,7 @@ dependencies = [ [[package]] name = "naga" version = "0.11.0" -source = "git+https://github.com/gfx-rs/naga?rev=58105a06e2bd5aefeb9330984d47976e63c11dc4#58105a06e2bd5aefeb9330984d47976e63c11dc4" +source = "git+https://github.com/gfx-rs/naga?rev=9742f1616c3e3dd2cc9a5880616fc886c391bb9f#9742f1616c3e3dd2cc9a5880616fc886c391bb9f" dependencies = [ "bit-set", "bitflags", diff --git a/Cargo.toml b/Cargo.toml index 86da72f75..3918b8da6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -42,7 +42,7 @@ version = "0.15" [workspace.dependencies.naga] git = "https://github.com/gfx-rs/naga" -rev = "58105a06e2bd5aefeb9330984d47976e63c11dc4" +rev = "9742f1616c3e3dd2cc9a5880616fc886c391bb9f" version = "0.11.0" [workspace.dependencies] diff --git a/wgpu-core/Cargo.toml b/wgpu-core/Cargo.toml index 596e6f01d..ec45d7085 100644 --- a/wgpu-core/Cargo.toml +++ b/wgpu-core/Cargo.toml @@ -70,7 +70,7 @@ thiserror = "1" [dependencies.naga] git = "https://github.com/gfx-rs/naga" -rev = "58105a06e2bd5aefeb9330984d47976e63c11dc4" +rev = "9742f1616c3e3dd2cc9a5880616fc886c391bb9f" version = "0.11.0" features = ["clone", "span", "validate"] diff --git a/wgpu-hal/Cargo.toml b/wgpu-hal/Cargo.toml index 51cb6d713..a41c21870 100644 --- a/wgpu-hal/Cargo.toml +++ b/wgpu-hal/Cargo.toml @@ -119,14 +119,14 @@ android_system_properties = "0.1.1" [dependencies.naga] git = "https://github.com/gfx-rs/naga" -rev = "58105a06e2bd5aefeb9330984d47976e63c11dc4" +rev = "9742f1616c3e3dd2cc9a5880616fc886c391bb9f" version = "0.11.0" features = ["clone"] # DEV dependencies [dev-dependencies.naga] git = "https://github.com/gfx-rs/naga" -rev = "58105a06e2bd5aefeb9330984d47976e63c11dc4" +rev = "9742f1616c3e3dd2cc9a5880616fc886c391bb9f" version = "0.11.0" features = ["wgsl-in"] diff --git a/wgpu/tests/shader/zero_init_workgroup_mem.rs b/wgpu/tests/shader/zero_init_workgroup_mem.rs index de4d5f602..c73cb13f9 100644 --- a/wgpu/tests/shader/zero_init_workgroup_mem.rs +++ b/wgpu/tests/shader/zero_init_workgroup_mem.rs @@ -30,9 +30,7 @@ fn zero_init_workgroup_mem() { Some(6880), Some("SwiftShader"), true, - ) - // TODO: investigate why it fails - .specific_failure(Some(Backends::GL), Some(65541), Some("llvmpipe"), false), + ), zero_init_workgroup_mem_impl, ); }