From b7e1852c9fb329be1699ba16290892a46d9c301d Mon Sep 17 00:00:00 2001
From: Nicolas Silva <nical@fastmail.com>
Date: Tue, 21 Feb 2023 11:10:38 +0100
Subject: [PATCH 1/2] Update naga to
 0.11.0@git:9742f1616c3e3dd2cc9a5880616fc886c391bb9f

---
 Cargo.lock           | 2 +-
 Cargo.toml           | 2 +-
 wgpu-core/Cargo.toml | 2 +-
 wgpu-hal/Cargo.toml  | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0ca3b87f2a..ed36d2264b 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 86da72f755..3918b8da6a 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 596e6f01d8..ec45d7085a 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 51cb6d713f..a41c21870c 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"]
 

From 6cb269be4b50d908b76904349922dbdfd26b8006 Mon Sep 17 00:00:00 2001
From: Nicolas Silva <nical@fastmail.com>
Date: Tue, 21 Feb 2023 11:27:10 +0100
Subject: [PATCH 2/2] Mark the zero init workgroup test as passing.

---
 wgpu/tests/shader/zero_init_workgroup_mem.rs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/wgpu/tests/shader/zero_init_workgroup_mem.rs b/wgpu/tests/shader/zero_init_workgroup_mem.rs
index de4d5f6027..c73cb13f97 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,
     );
 }