Fix lifetime issue.

stripe2933 · Jan 8, 2025 · 5e54fec · 5e54fec
1 parent fc68f7d
commit 5e54fec
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 16 deletions.
diff --git a/interface/vulkan/pipeline/PrimitiveRenderer.cppm b/interface/vulkan/pipeline/PrimitiveRenderer.cppm
@@ -42,24 +42,28 @@ namespace vk_gltf_viewer::vulkan::inline pipeline {
             const rp::Scene &sceneRenderPass
         ) const {
             const auto vertexShaderSpecializationData = getVertexShaderSpecializationData();
+            const vk::SpecializationInfo vertexShaderSpecializationInfo {
+                SpecializationMap<VertexShaderSpecializationData>::value,
+                vk::ArrayProxyNoTemporaries<const VertexShaderSpecializationData> { vertexShaderSpecializationData },
+            };
+
             const auto fragmentShaderSpecializationData = getFragmentShaderSpecializationData();
+            const vk::SpecializationInfo fragmentShaderSpecializationInfo {
+                SpecializationMap<FragmentShaderSpecializationData>::value,
+                vk::ArrayProxyNoTemporaries<const FragmentShaderSpecializationData> { fragmentShaderSpecializationData },
+            };
+
             const vku::RefHolder pipelineStages = createPipelineStages(
                 device,
                 vku::Shader {
                     std::apply(LIFT(shader_selector::primitive_vert), getVertexShaderVariants()),
                     vk::ShaderStageFlagBits::eVertex,
-                    vku::unsafeAddress(vk::SpecializationInfo {
-                        SpecializationMap<VertexShaderSpecializationData>::value,
-                        vk::ArrayProxyNoTemporaries<const VertexShaderSpecializationData> { vertexShaderSpecializationData },
-                    }),
+                    &vertexShaderSpecializationInfo,
                 },
                 vku::Shader {
                     std::apply(LIFT(shader_selector::primitive_frag), getFragmentShaderVariants()),
                     vk::ShaderStageFlagBits::eFragment,
-                    vku::unsafeAddress(vk::SpecializationInfo {
-                        SpecializationMap<FragmentShaderSpecializationData>::value,
-                        vk::ArrayProxyNoTemporaries<const FragmentShaderSpecializationData> { fragmentShaderSpecializationData },
-                    }),
+                    &fragmentShaderSpecializationInfo,
                 });
 
             switch (alphaMode) {

diff --git a/interface/vulkan/pipeline/UnlitPrimitiveRenderer.cppm b/interface/vulkan/pipeline/UnlitPrimitiveRenderer.cppm
@@ -34,25 +34,28 @@ namespace vk_gltf_viewer::vulkan::inline pipeline {
             const rp::Scene &sceneRenderPass
         ) const {
             const auto vertexShaderSpecializationData = getVertexShaderSpecializationData();
+            const vk::SpecializationInfo vertexShaderSpecializationInfo {
+                SpecializationMap<VertexShaderSpecializationData>::value,
+                vk::ArrayProxyNoTemporaries<const VertexShaderSpecializationData> { vertexShaderSpecializationData },
+            };
+
             const auto fragmentShaderSpecializationData = getFragmentShaderSpecializationData();
+            const vk::SpecializationInfo fragmentShaderSpecializationInfo {
+                SpecializationMap<FragmentShaderSpecializationData>::value,
+                vk::ArrayProxyNoTemporaries<const FragmentShaderSpecializationData> { fragmentShaderSpecializationData },
+            };
 
             const vku::RefHolder pipelineStages = createPipelineStages(
                 device,
                 vku::Shader {
                     std::apply(LIFT(shader_selector::unlit_primitive_vert), getVertexShaderVariants()),
                     vk::ShaderStageFlagBits::eVertex,
-                    vku::unsafeAddress(vk::SpecializationInfo {
-                        SpecializationMap<VertexShaderSpecializationData>::value,
-                        vk::ArrayProxyNoTemporaries<const VertexShaderSpecializationData> { vertexShaderSpecializationData },
-                    }),
+                    &vertexShaderSpecializationInfo
                 },
                 vku::Shader {
                     std::apply(LIFT(shader_selector::unlit_primitive_frag), getFragmentShaderVariants()),
                     vk::ShaderStageFlagBits::eFragment,
-                    vku::unsafeAddress(vk::SpecializationInfo {
-                        SpecializationMap<FragmentShaderSpecializationData>::value,
-                        vk::ArrayProxyNoTemporaries<const FragmentShaderSpecializationData> { fragmentShaderSpecializationData },
-                    }),
+                    &fragmentShaderSpecializationInfo,
                 });
 
             switch (alphaMode) {