From 9bbea3d348e635676e22bd6133ccd8990874e832 Mon Sep 17 00:00:00 2001
From: Dzmitry Malyshau <kvark@fastmail.com>
Date: Sat, 4 Dec 2021 12:22:57 -0500
Subject: [PATCH] Update naga to c69f676

---
 Cargo.lock                            | 2 +-
 wgpu-core/Cargo.toml                  | 2 +-
 wgpu-hal/Cargo.toml                   | 4 ++--
 wgpu-hal/examples/halmark/shader.wgsl | 4 ++--
 wgpu/Cargo.toml                       | 6 +++---
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index de656cabee..0e37bfc12a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -872,7 +872,7 @@ dependencies = [
 [[package]]
 name = "naga"
 version = "0.7.1"
-source = "git+https://github.com/gfx-rs/naga?rev=29571cc#29571cc4cfbb28558948b1b31ad764f55b69f37b"
+source = "git+https://github.com/gfx-rs/naga?rev=c69f676#c69f67660973a3bffa3b27c295f698dc4aa01524"
 dependencies = [
  "bit-set",
  "bitflags",
diff --git a/wgpu-core/Cargo.toml b/wgpu-core/Cargo.toml
index 10b5fcd285..0de1de1ea6 100644
--- a/wgpu-core/Cargo.toml
+++ b/wgpu-core/Cargo.toml
@@ -37,7 +37,7 @@ thiserror = "1"
 
 [dependencies.naga]
 git = "https://github.com/gfx-rs/naga"
-rev = "29571cc"
+rev = "c69f676"
 #version = "0.7"
 features = ["span", "validate", "wgsl-in"]
 
diff --git a/wgpu-hal/Cargo.toml b/wgpu-hal/Cargo.toml
index 359a9a108e..9c2640a63e 100644
--- a/wgpu-hal/Cargo.toml
+++ b/wgpu-hal/Cargo.toml
@@ -75,12 +75,12 @@ js-sys = { version = "0.3" }
 
 [dependencies.naga]
 git = "https://github.com/gfx-rs/naga"
-rev = "29571cc"
+rev = "c69f676"
 #version = "0.7"
 
 [dev-dependencies.naga]
 git = "https://github.com/gfx-rs/naga"
-rev = "29571cc"
+rev = "c69f676"
 #version = "0.7"
 features = ["wgsl-in"]
 
diff --git a/wgpu-hal/examples/halmark/shader.wgsl b/wgpu-hal/examples/halmark/shader.wgsl
index b8639d1ca3..8030b5bd39 100644
--- a/wgpu-hal/examples/halmark/shader.wgsl
+++ b/wgpu-hal/examples/halmark/shader.wgsl
@@ -35,9 +35,9 @@ fn vs_main([[builtin(vertex_index)]] vi: u32) -> VertexOutput {
 [[group(0), binding(1)]]
 var texture: texture_2d<f32>;
 [[group(0), binding(2)]]
-var sampler: sampler;
+var sam: sampler;
 
 [[stage(fragment)]]
 fn fs_main(in: VertexOutput) -> [[location(0)]] vec4<f32> {
-    return in.color * textureSampleLevel(texture, sampler, in.tex_coords, 0.0);
+    return in.color * textureSampleLevel(texture, sam, in.tex_coords, 0.0);
 }
diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml
index d92961d5db..d02b17fdc9 100644
--- a/wgpu/Cargo.toml
+++ b/wgpu/Cargo.toml
@@ -135,20 +135,20 @@ env_logger = "0.8"
 
 [dependencies.naga]
 git = "https://github.com/gfx-rs/naga"
-rev = "29571cc"
+rev = "c69f676"
 #version = "0.7"
 optional = true
 
 # used to test all the example shaders
 [dev-dependencies.naga]
 git = "https://github.com/gfx-rs/naga"
-rev = "29571cc"
+rev = "c69f676"
 #version = "0.7"
 features = ["wgsl-in"]
 
 [target.'cfg(target_arch = "wasm32")'.dependencies.naga]
 git = "https://github.com/gfx-rs/naga"
-rev = "29571cc"
+rev = "c69f676"
 #version = "0.7"
 features = ["wgsl-out"]