Apply specialization to shader reflection (#2329)

* Apply specialization to shader reflection * Remove redundant method * Remove all the SpecId decorations too * Don't unnecessarily collect the instructions * Replace decoration groups with individual decorations * Rename with_specialization * Missed renames * Remove the Arcs
vulkano-rs · Sep 14, 2023 · 3c49541 · 3c49541
1 parent 56e78d9
commit 3c49541
Show file tree

Hide file tree

Showing 17 changed files with 2,474 additions and 2,321 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -167,7 +167,7 @@ Changes to the `khr_display` extension:
 - Added `DeviceMemory::{map, unmap, mapping_state, invalidate_range, flush_range}`, `MappedDeviceMemory` has been deprecated.
 - Added `MemoryMapInfo`, `MemoryUnmapInfo`, `MappingState` and `MappedMemoryRange`.
 - Added `ShaderModule::single_entry_point()` which may replace `entry_point("main")` calls in common setups.
-- Added `ShaderModule::single_entry_point_of_execution`.
+- Added `ShaderModule::single_entry_point_with_execution`.
 - Added `GenericMemoryAllocatorCreateInfo::memory_type_bits` and `AllocationCreateInfo::memory_type_bits`.
 
 ### Bugs fixed

diff --git a/examples/src/bin/dynamic-local-size.rs b/examples/src/bin/dynamic-local-size.rs
@@ -179,21 +179,22 @@ fn main() {
 
     let pipeline = {
         let cs = cs::load(device.clone())
+            .unwrap()
+            .specialize(
+                [
+                    (0, 0.2f32.into()),
+                    (1, local_size_x.into()),
+                    (2, local_size_y.into()),
+                    (3, 0.5f32.into()),
+                    (4, 1.0f32.into()),
+                ]
+                .into_iter()
+                .collect(),
+            )
             .unwrap()
             .entry_point("main")
             .unwrap();
-        let stage = PipelineShaderStageCreateInfo {
-            specialization_info: [
-                (0, 0.2f32.into()),
-                (1, local_size_x.into()),
-                (2, local_size_y.into()),
-                (3, 0.5f32.into()),
-                (4, 1.0f32.into()),
-            ]
-            .into_iter()
-            .collect(),
-            ..PipelineShaderStageCreateInfo::new(cs)
-        };
+        let stage = PipelineShaderStageCreateInfo::new(cs);
         let layout = PipelineLayout::new(
             device.clone(),
             PipelineDescriptorSetLayoutCreateInfo::from_stages([&stage])

diff --git a/examples/src/bin/shader-types-sharing.rs b/examples/src/bin/shader-types-sharing.rs
@@ -256,13 +256,12 @@ fn main() {
     // Load the first shader, and create a pipeline for the shader.
     let mult_pipeline = {
         let cs = shaders::load_mult(device.clone())
+            .unwrap()
+            .specialize([(0, true.into())].into_iter().collect())
             .unwrap()
             .entry_point("main")
             .unwrap();
-        let stage = PipelineShaderStageCreateInfo {
-            specialization_info: [(0, true.into())].into_iter().collect(),
-            ..PipelineShaderStageCreateInfo::new(cs)
-        };
+        let stage = PipelineShaderStageCreateInfo::new(cs);
         let layout = PipelineLayout::new(
             device.clone(),
             PipelineDescriptorSetLayoutCreateInfo::from_stages([&stage])
@@ -281,13 +280,12 @@ fn main() {
     // Load the second shader, and create a pipeline for the shader.
     let add_pipeline = {
         let cs = shaders::load_add(device.clone())
+            .unwrap()
+            .specialize([(0, true.into())].into_iter().collect())
             .unwrap()
             .entry_point("main")
             .unwrap();
-        let stage = PipelineShaderStageCreateInfo {
-            specialization_info: [(0, true.into())].into_iter().collect(),
-            ..PipelineShaderStageCreateInfo::new(cs)
-        };
+        let stage = PipelineShaderStageCreateInfo::new(cs);
         let layout = PipelineLayout::new(
             device.clone(),
             PipelineDescriptorSetLayoutCreateInfo::from_stages([&stage])

diff --git a/examples/src/bin/specialization-constants.rs b/examples/src/bin/specialization-constants.rs
@@ -117,15 +117,16 @@ fn main() {
 
     let pipeline = {
         let cs = cs::load(device.clone())
+            .unwrap()
+            .specialize(
+                [(0, 1i32.into()), (1, 1.0f32.into()), (2, true.into())]
+                    .into_iter()
+                    .collect(),
+            )
             .unwrap()
             .entry_point("main")
             .unwrap();
-        let stage = PipelineShaderStageCreateInfo {
-            specialization_info: [(0, 1i32.into()), (1, 1.0f32.into()), (2, true.into())]
-                .into_iter()
-                .collect(),
-            ..PipelineShaderStageCreateInfo::new(cs)
-        };
+        let stage = PipelineShaderStageCreateInfo::new(cs);
         let layout = PipelineLayout::new(
             device.clone(),
             PipelineDescriptorSetLayoutCreateInfo::from_stages([&stage])

diff --git a/vulkano-shaders/src/codegen.rs b/vulkano-shaders/src/codegen.rs
@@ -8,7 +8,6 @@
 // according to those terms.
 
 use crate::{
-    entry_point,
     structs::{self, TypeRegistry},
     MacroInput,
 };
@@ -23,10 +22,7 @@ use std::{
     path::{Path, PathBuf},
 };
 use syn::{Error, LitStr};
-use vulkano::{
-    shader::{reflect, spirv::Spirv},
-    Version,
-};
+use vulkano::shader::spirv::Spirv;
 
 pub struct Shader {
     pub source: LitStr,
@@ -238,29 +234,6 @@ pub(super) fn reflect(
         }
     });
 
-    let spirv_version = {
-        let Version {
-            major,
-            minor,
-            patch,
-        } = shader.spirv.version();
-
-        quote! {
-            ::vulkano::Version {
-                major: #major,
-                minor: #minor,
-                patch: #patch,
-            }
-        }
-    };
-    let spirv_capabilities = reflect::spirv_capabilities(&shader.spirv).map(|capability| {
-        let name = format_ident!("{}", format!("{:?}", capability));
-        quote! { &::vulkano::shader::spirv::Capability::#name }
-    });
-    let spirv_extensions = reflect::spirv_extensions(&shader.spirv);
-    let entry_points =
-        reflect::entry_points(&shader.spirv).map(|info| entry_point::write_entry_point(&info));
-
     let load_name = if shader.name.is_empty() {
         format_ident!("load")
     } else {
@@ -282,13 +255,9 @@ pub(super) fn reflect(
             static WORDS: &[u32] = &[ #( #words ),* ];
 
             unsafe {
-                ::vulkano::shader::ShaderModule::new_with_data(
+                ::vulkano::shader::ShaderModule::new(
                     device,
                     ::vulkano::shader::ShaderModuleCreateInfo::new(&WORDS),
-                    [ #( #entry_points ),* ],
-                    #spirv_version,
-                    [ #( #spirv_capabilities ),* ],
-                    [ #( #spirv_extensions ),* ],
                 )
             }
         }
@@ -302,6 +271,7 @@ pub(super) fn reflect(
 #[cfg(test)]
 mod tests {
     use super::*;
+    use vulkano::shader::reflect;
 
     fn convert_paths(root_path: &Path, paths: &[PathBuf]) -> Vec<String> {
         paths