From 76b5a3a331aebb1ee3c271ab3605f23329a130c5 Mon Sep 17 00:00:00 2001 From: Ivan Mironov Date: Sat, 29 Aug 2020 22:41:14 +0500 Subject: [PATCH] [rs] Use `wgpu::include_spirv!()` for all shaders in examples/texture-arrays `wgpu::include_spirv!()` writes file name into log. This is useful to understand which fragment shader is used (choice depends on device features). --- wgpu/examples/texture-arrays/main.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 = 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::(); let vertex_data = create_vertices();