diff --git a/wgpu/examples/texture-arrays/main.rs b/wgpu/examples/texture-arrays/main.rs
index bb92d8ca15..b0178dc4bc 100644
--- a/wgpu/examples/texture-arrays/main.rs
+++ b/wgpu/examples/texture-arrays/main.rs
@@ -103,23 +103,23 @@ impl framework::Example for Example {
     ) -> Self {
         let mut uniform_workaround = false;
         let vs_module = device.create_shader_module(wgpu::include_spirv!("shader.vert.spv"));
-        let fs_bytes: Vec<u8> = match device.features() {
+        let fs_source = match device.features() {
             f if f.contains(wgpu::Features::UNSIZED_BINDING_ARRAY) => {
-                include_bytes!("unsized-non-uniform.frag.spv").to_vec()
+                wgpu::include_spirv!("unsized-non-uniform.frag.spv")
             }
             f if f.contains(wgpu::Features::SAMPLED_TEXTURE_ARRAY_NON_UNIFORM_INDEXING) => {
-                include_bytes!("non-uniform.frag.spv").to_vec()
+                wgpu::include_spirv!("non-uniform.frag.spv")
             }
             f if f.contains(wgpu::Features::SAMPLED_TEXTURE_ARRAY_DYNAMIC_INDEXING) => {
                 uniform_workaround = true;
-                include_bytes!("uniform.frag.spv").to_vec()
+                wgpu::include_spirv!("uniform.frag.spv")
             }
             f if f.contains(wgpu::Features::SAMPLED_TEXTURE_BINDING_ARRAY) => {
-                include_bytes!("constant.frag.spv").to_vec()
+                wgpu::include_spirv!("constant.frag.spv")
             }
             _ => unreachable!(),
         };
-        let fs_module = device.create_shader_module(wgpu::util::make_spirv(&fs_bytes));
+        let fs_module = device.create_shader_module(fs_source);
 
         let vertex_size = std::mem::size_of::<Vertex>();
         let vertex_data = create_vertices();
diff --git a/wgpu/examples/texture-arrays/non-uniform.frag b/wgpu/examples/texture-arrays/non-uniform.frag
index 994c50a664..30cfba0fa6 100644
--- a/wgpu/examples/texture-arrays/non-uniform.frag
+++ b/wgpu/examples/texture-arrays/non-uniform.frag
@@ -3,7 +3,7 @@
 #extension GL_EXT_nonuniform_qualifier : require
 
 layout(location = 0) in vec2 v_TexCoord;
-layout(location = 1) flat in int v_Index;  // dynamically non-uniform
+layout(location = 1) nonuniformEXT flat in int v_Index;  // dynamically non-uniform
 layout(location = 0) out vec4 o_Color;
 
 layout(set = 0, binding = 0) uniform texture2D u_Textures[2];
diff --git a/wgpu/examples/texture-arrays/non-uniform.frag.spv b/wgpu/examples/texture-arrays/non-uniform.frag.spv
index 1c0be40cdb..caba8fc91f 100644
Binary files a/wgpu/examples/texture-arrays/non-uniform.frag.spv and b/wgpu/examples/texture-arrays/non-uniform.frag.spv differ
diff --git a/wgpu/examples/texture-arrays/unsized-non-uniform.frag b/wgpu/examples/texture-arrays/unsized-non-uniform.frag
index c1013f6ab0..cd6068144e 100644
--- a/wgpu/examples/texture-arrays/unsized-non-uniform.frag
+++ b/wgpu/examples/texture-arrays/unsized-non-uniform.frag
@@ -3,7 +3,7 @@
 #extension GL_EXT_nonuniform_qualifier : require
 
 layout(location = 0) in vec2 v_TexCoord;
-layout(location = 1) flat in int v_Index;  // dynamically non-uniform
+layout(location = 1) nonuniformEXT flat in int v_Index;  // dynamically non-uniform
 layout(location = 0) out vec4 o_Color;
 
 layout(set = 0, binding = 0) uniform texture2D u_Textures[];
diff --git a/wgpu/examples/texture-arrays/unsized-non-uniform.frag.spv b/wgpu/examples/texture-arrays/unsized-non-uniform.frag.spv
index 995f84d62d..1c0688ff7c 100644
Binary files a/wgpu/examples/texture-arrays/unsized-non-uniform.frag.spv and b/wgpu/examples/texture-arrays/unsized-non-uniform.frag.spv differ