wgpu: use spirv passthrough and explicit pipeline layout creation

Cargo.toml

@@ -32,5 +32,5 @@ glam = { version = "0.30.9", default-features = false }
 bytemuck = { version = "1.24.0", features = ["derive"] }
 raw-window-handle = "0.6.2"
 winit = "0.30.0"
-cfg-if = "1.0.0"
+env_logger = "0.11.8"
 anyhow = "1.0.98"

generated/graphics/ash/cargo-gpu/Cargo.toml

@@ -29,6 +29,6 @@ glam = { version = "0.30.9", default-features = false }
 bytemuck = { version = "1.24.0", features = ["derive"] }
 raw-window-handle = "0.6.2"
 winit = "0.30.0"
-cfg-if = "1.0.0"
+env_logger = "0.11.8"
 anyhow = "1.0.98"
 

generated/graphics/ash/spirv-builder/Cargo.toml

@@ -30,7 +30,7 @@ glam = { version = "0.30.9", default-features = false }
 bytemuck = { version = "1.24.0", features = ["derive"] }
 raw-window-handle = "0.6.2"
 winit = "0.30.0"
-cfg-if = "1.0.0"
+env_logger = "0.11.8"
 anyhow = "1.0.98"
 
 # Optimize build scripts, copied from rust-gpu's repo

generated/graphics/wgpu/cargo-gpu/Cargo.toml

@@ -29,6 +29,6 @@ glam = { version = "0.30.9", default-features = false }
 bytemuck = { version = "1.24.0", features = ["derive"] }
 raw-window-handle = "0.6.2"
 winit = "0.30.0"
-cfg-if = "1.0.0"
+env_logger = "0.11.8"
 anyhow = "1.0.98"
 

generated/graphics/wgpu/cargo-gpu/mygraphics/Cargo.toml

@@ -17,6 +17,7 @@ mygraphics-shaders = { path = "../mygraphics-shaders" }
 # API
 wgpu.workspace = true
 pollster.workspace = true
+env_logger.workspace = true
 
 # other
 raw-window-handle.workspace = true

generated/graphics/wgpu/cargo-gpu/mygraphics/src/wgpu_renderer/mod.rs

@@ -10,6 +10,7 @@ mod renderer;
 mod swapchain;
 
 pub fn main() -> anyhow::Result<()> {
+    env_logger::init();
     pollster::block_on(main_inner())
 }
 
@@ -35,7 +36,8 @@ pub async fn main_inner() -> anyhow::Result<()> {
     let adapter =
         wgpu::util::initialize_adapter_from_env_or_default(&instance, Some(&surface)).await?;
 
-    let required_features = wgpu::Features::PUSH_CONSTANTS;
+    let required_features =
+        wgpu::Features::PUSH_CONSTANTS | wgpu::Features::EXPERIMENTAL_PASSTHROUGH_SHADERS;
     let required_limits = wgpu::Limits {
         max_push_constant_size: 128,
         ..Default::default()
@@ -45,7 +47,7 @@ pub async fn main_inner() -> anyhow::Result<()> {
             label: None,
             required_features,
             required_limits,
-            experimental_features: wgpu::ExperimentalFeatures::disabled(),
+            experimental_features: unsafe { wgpu::ExperimentalFeatures::enabled() },
             memory_hints: wgpu::MemoryHints::Performance,
             trace: Default::default(),
         })

generated/graphics/wgpu/cargo-gpu/mygraphics/src/wgpu_renderer/render_pipeline.rs

@@ -1,8 +1,9 @@
 use mygraphics_shaders::ShaderConstants;
 use wgpu::{
-    include_spirv, ColorTargetState, ColorWrites, Device, FragmentState, FrontFace,
-    MultisampleState, PolygonMode, PrimitiveState, PrimitiveTopology, RenderPass, RenderPipeline,
-    RenderPipelineDescriptor, ShaderStages, TextureFormat, VertexState,
+    ColorTargetState, ColorWrites, Device, FragmentState, FrontFace, MultisampleState,
+    PipelineLayoutDescriptor, PolygonMode, PrimitiveState, PrimitiveTopology, PushConstantRange,
+    RenderPass, RenderPipeline, RenderPipelineDescriptor, ShaderModuleDescriptorPassthrough,
+    ShaderRuntimeChecks, ShaderStages, TextureFormat, VertexState,
 };
 
 pub struct MyRenderPipeline {
@@ -11,14 +12,44 @@ pub struct MyRenderPipeline {
 
 impl MyRenderPipeline {
     pub fn new(device: &Device, out_format: TextureFormat) -> anyhow::Result<Self> {
-        let module = device.create_shader_module(include_spirv!(env!("SHADER_SPV_PATH")));
+        // Workaround in wgpu 27.0.1 where the macro expansion of `include_spirv_raw!` doesn't compile
+        // see https://github.com/gfx-rs/wgpu/pull/8250
+        // let module = unsafe {
+        //     device.create_shader_module_passthrough(include_spirv_raw!(env!("SHADER_SPV_PATH")))
+        // };
+        let module = unsafe {
+            device.create_shader_module_passthrough(ShaderModuleDescriptorPassthrough {
+                label: Some(env!("SHADER_SPV_PATH")),
+                entry_point: "".to_owned(),
+                num_workgroups: (0, 0, 0),
+                runtime_checks: ShaderRuntimeChecks::unchecked(),
+                spirv: Some(wgpu::util::make_spirv_raw(include_bytes!(env!(
+                    "SHADER_SPV_PATH"
+                )))),
+                dxil: None,
+                msl: None,
+                hlsl: None,
+                glsl: None,
+                wgsl: None,
+            })
+        };
+
+        let layout = device.create_pipeline_layout(&PipelineLayoutDescriptor {
+            label: Some("MyRenderPipeline layout"),
+            bind_group_layouts: &[],
+            push_constant_ranges: &[PushConstantRange {
+                stages: ShaderStages::VERTEX_FRAGMENT,
+                range: 0..size_of::<ShaderConstants>() as u32,
+            }],
+        });
+
         Ok(Self {
             pipeline: device.create_render_pipeline(&RenderPipelineDescriptor {
                 label: Some("MyRenderPipeline"),
-                layout: None,
+                layout: Some(&layout),
                 vertex: VertexState {
                     module: &module,
-                    entry_point: None,
+                    entry_point: Some("main_vs"),
                     compilation_options: Default::default(),
                     buffers: &[],
                 },
@@ -35,7 +66,7 @@ impl MyRenderPipeline {
                 multisample: MultisampleState::default(),
                 fragment: Some(FragmentState {
                     module: &module,
-                    entry_point: None,
+                    entry_point: Some("main_fs"),
                     compilation_options: Default::default(),
                     targets: &[Some(ColorTargetState {
                         format: out_format,

generated/graphics/wgpu/spirv-builder/Cargo.toml

@@ -30,7 +30,7 @@ glam = { version = "0.30.9", default-features = false }
 bytemuck = { version = "1.24.0", features = ["derive"] }
 raw-window-handle = "0.6.2"
 winit = "0.30.0"
-cfg-if = "1.0.0"
+env_logger = "0.11.8"
 anyhow = "1.0.98"
 
 # Optimize build scripts, copied from rust-gpu's repo

generated/graphics/wgpu/spirv-builder/mygraphics/Cargo.toml

@@ -21,6 +21,7 @@ mygraphics-shaders = { path = "../mygraphics-shaders" }
 # API
 wgpu.workspace = true
 pollster.workspace = true
+env_logger.workspace = true
 
 # other
 raw-window-handle.workspace = true

generated/graphics/wgpu/spirv-builder/mygraphics/src/wgpu_renderer/mod.rs

@@ -10,6 +10,7 @@ mod renderer;
 mod swapchain;
 
 pub fn main() -> anyhow::Result<()> {
+    env_logger::init();
     pollster::block_on(main_inner())
 }
 
@@ -35,7 +36,8 @@ pub async fn main_inner() -> anyhow::Result<()> {
     let adapter =
         wgpu::util::initialize_adapter_from_env_or_default(&instance, Some(&surface)).await?;
 
-    let required_features = wgpu::Features::PUSH_CONSTANTS;
+    let required_features =
+        wgpu::Features::PUSH_CONSTANTS | wgpu::Features::EXPERIMENTAL_PASSTHROUGH_SHADERS;
     let required_limits = wgpu::Limits {
         max_push_constant_size: 128,
         ..Default::default()
@@ -45,7 +47,7 @@ pub async fn main_inner() -> anyhow::Result<()> {
             label: None,
             required_features,
             required_limits,
-            experimental_features: wgpu::ExperimentalFeatures::disabled(),
+            experimental_features: unsafe { wgpu::ExperimentalFeatures::enabled() },
             memory_hints: wgpu::MemoryHints::Performance,
             trace: Default::default(),
         })

generated/graphics/wgpu/spirv-builder/mygraphics/src/wgpu_renderer/render_pipeline.rs

@@ -1,8 +1,9 @@
 use mygraphics_shaders::ShaderConstants;
 use wgpu::{
-    include_spirv, ColorTargetState, ColorWrites, Device, FragmentState, FrontFace,
-    MultisampleState, PolygonMode, PrimitiveState, PrimitiveTopology, RenderPass, RenderPipeline,
-    RenderPipelineDescriptor, ShaderStages, TextureFormat, VertexState,
+    ColorTargetState, ColorWrites, Device, FragmentState, FrontFace, MultisampleState,
+    PipelineLayoutDescriptor, PolygonMode, PrimitiveState, PrimitiveTopology, PushConstantRange,
+    RenderPass, RenderPipeline, RenderPipelineDescriptor, ShaderModuleDescriptorPassthrough,
+    ShaderRuntimeChecks, ShaderStages, TextureFormat, VertexState,
 };
 
 pub struct MyRenderPipeline {
@@ -11,14 +12,44 @@ pub struct MyRenderPipeline {
 
 impl MyRenderPipeline {
     pub fn new(device: &Device, out_format: TextureFormat) -> anyhow::Result<Self> {
-        let module = device.create_shader_module(include_spirv!(env!("SHADER_SPV_PATH")));
+        // Workaround in wgpu 27.0.1 where the macro expansion of `include_spirv_raw!` doesn't compile
+        // see https://github.com/gfx-rs/wgpu/pull/8250
+        // let module = unsafe {
+        //     device.create_shader_module_passthrough(include_spirv_raw!(env!("SHADER_SPV_PATH")))
+        // };
+        let module = unsafe {
+            device.create_shader_module_passthrough(ShaderModuleDescriptorPassthrough {
+                label: Some(env!("SHADER_SPV_PATH")),
+                entry_point: "".to_owned(),
+                num_workgroups: (0, 0, 0),
+                runtime_checks: ShaderRuntimeChecks::unchecked(),
+                spirv: Some(wgpu::util::make_spirv_raw(include_bytes!(env!(
+                    "SHADER_SPV_PATH"
+                )))),
+                dxil: None,
+                msl: None,
+                hlsl: None,
+                glsl: None,
+                wgsl: None,
+            })
+        };
+
+        let layout = device.create_pipeline_layout(&PipelineLayoutDescriptor {
+            label: Some("MyRenderPipeline layout"),
+            bind_group_layouts: &[],
+            push_constant_ranges: &[PushConstantRange {
+                stages: ShaderStages::VERTEX_FRAGMENT,
+                range: 0..size_of::<ShaderConstants>() as u32,
+            }],
+        });
+
         Ok(Self {
             pipeline: device.create_render_pipeline(&RenderPipelineDescriptor {
                 label: Some("MyRenderPipeline"),
-                layout: None,
+                layout: Some(&layout),
                 vertex: VertexState {
                     module: &module,
-                    entry_point: None,
+                    entry_point: Some("main_vs"),
                     compilation_options: Default::default(),
                     buffers: &[],
                 },
@@ -35,7 +66,7 @@ impl MyRenderPipeline {
                 multisample: MultisampleState::default(),
                 fragment: Some(FragmentState {
                     module: &module,
-                    entry_point: None,
+                    entry_point: Some("main_fs"),
                     compilation_options: Default::default(),
                     targets: &[Some(ColorTargetState {
                         format: out_format,

graphics/Cargo.toml.liquid

@@ -41,7 +41,7 @@ glam = { version = "0.30.9", default-features = false }
 bytemuck = { version = "1.24.0", features = ["derive"] }
 raw-window-handle = "0.6.2"
 winit = "0.30.0"
-cfg-if = "1.0.0"
+env_logger = "0.11.8"
 anyhow = "1.0.98"
 
 {% if integration == "spirv-builder" -%}

graphics/mygraphics/Cargo.toml

@@ -19,6 +19,7 @@ ash.workspace = true
 ash-window.workspace = true
 wgpu.workspace = true
 pollster.workspace = true
+env_logger.workspace = true
 
 # other
 raw-window-handle.workspace = true

graphics/mygraphics/Cargo.toml.liquid

@@ -29,6 +29,7 @@ ash-window.workspace = true
 {%- if api == "wgpu" -%}
 wgpu.workspace = true
 pollster.workspace = true
+env_logger.workspace = true
 {%- endif %}
 
 # other

graphics/mygraphics/src/wgpu_renderer/mod.rs

@@ -10,6 +10,7 @@ mod renderer;
 mod swapchain;
 
 pub fn main() -> anyhow::Result<()> {
+    env_logger::init();
     pollster::block_on(main_inner())
 }
 
@@ -35,7 +36,8 @@ pub async fn main_inner() -> anyhow::Result<()> {
     let adapter =
         wgpu::util::initialize_adapter_from_env_or_default(&instance, Some(&surface)).await?;
 
-    let required_features = wgpu::Features::PUSH_CONSTANTS;
+    let required_features =
+        wgpu::Features::PUSH_CONSTANTS | wgpu::Features::EXPERIMENTAL_PASSTHROUGH_SHADERS;
     let required_limits = wgpu::Limits {
         max_push_constant_size: 128,
         ..Default::default()
@@ -45,7 +47,7 @@ pub async fn main_inner() -> anyhow::Result<()> {
             label: None,
             required_features,
             required_limits,
-            experimental_features: wgpu::ExperimentalFeatures::disabled(),
+            experimental_features: unsafe { wgpu::ExperimentalFeatures::enabled() },
             memory_hints: wgpu::MemoryHints::Performance,
             trace: Default::default(),
         })

graphics/mygraphics/src/wgpu_renderer/render_pipeline.rs

@@ -1,8 +1,9 @@
 use mygraphics_shaders::ShaderConstants;
 use wgpu::{
-    ColorTargetState, ColorWrites, Device, FragmentState, FrontFace, MultisampleState, PolygonMode,
-    PrimitiveState, PrimitiveTopology, RenderPass, RenderPipeline, RenderPipelineDescriptor,
-    ShaderStages, TextureFormat, VertexState, include_spirv,
+    ColorTargetState, ColorWrites, Device, FragmentState, FrontFace, MultisampleState,
+    PipelineLayoutDescriptor, PolygonMode, PrimitiveState, PrimitiveTopology, PushConstantRange,
+    RenderPass, RenderPipeline, RenderPipelineDescriptor, ShaderModuleDescriptorPassthrough,
+    ShaderRuntimeChecks, ShaderStages, TextureFormat, VertexState,
 };
 
 pub struct MyRenderPipeline {
@@ -11,14 +12,44 @@ pub struct MyRenderPipeline {
 
 impl MyRenderPipeline {
     pub fn new(device: &Device, out_format: TextureFormat) -> anyhow::Result<Self> {
-        let module = device.create_shader_module(include_spirv!(env!("SHADER_SPV_PATH")));
+        // Workaround in wgpu 27.0.1 where the macro expansion of `include_spirv_raw!` doesn't compile
+        // see https://github.com/gfx-rs/wgpu/pull/8250
+        // let module = unsafe {
+        //     device.create_shader_module_passthrough(include_spirv_raw!(env!("SHADER_SPV_PATH")))
+        // };
+        let module = unsafe {
+            device.create_shader_module_passthrough(ShaderModuleDescriptorPassthrough {
+                label: Some(env!("SHADER_SPV_PATH")),
+                entry_point: "".to_owned(),
+                num_workgroups: (0, 0, 0),
+                runtime_checks: ShaderRuntimeChecks::unchecked(),
+                spirv: Some(wgpu::util::make_spirv_raw(include_bytes!(env!(
+                    "SHADER_SPV_PATH"
+                )))),
+                dxil: None,
+                msl: None,
+                hlsl: None,
+                glsl: None,
+                wgsl: None,
+            })
+        };
+
+        let layout = device.create_pipeline_layout(&PipelineLayoutDescriptor {
+            label: Some("MyRenderPipeline layout"),
+            bind_group_layouts: &[],
+            push_constant_ranges: &[PushConstantRange {
+                stages: ShaderStages::VERTEX_FRAGMENT,
+                range: 0..size_of::<ShaderConstants>() as u32,
+            }],
+        });
+
         Ok(Self {
             pipeline: device.create_render_pipeline(&RenderPipelineDescriptor {
                 label: Some("MyRenderPipeline"),
-                layout: None,
+                layout: Some(&layout),
                 vertex: VertexState {
                     module: &module,
-                    entry_point: None,
+                    entry_point: Some("main_vs"),
                     compilation_options: Default::default(),
                     buffers: &[],
                 },
@@ -35,7 +66,7 @@ impl MyRenderPipeline {
                 multisample: MultisampleState::default(),
                 fragment: Some(FragmentState {
                     module: &module,
-                    entry_point: None,
+                    entry_point: Some("main_fs"),
                     compilation_options: Default::default(),
                     targets: &[Some(ColorTargetState {
                         format: out_format,