From 933ab029627aa82fb3a626880bd03f407d1af825 Mon Sep 17 00:00:00 2001 From: assiduous Date: Wed, 23 Dec 2020 10:51:10 -0800 Subject: Few more minor updates to ray tracing PSO create info validation --- .../GraphicsEngineVulkan/src/PipelineStateVkImpl.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'Graphics/GraphicsEngineVulkan') diff --git a/Graphics/GraphicsEngineVulkan/src/PipelineStateVkImpl.cpp b/Graphics/GraphicsEngineVulkan/src/PipelineStateVkImpl.cpp index 5427e257..5d52dd86 100644 --- a/Graphics/GraphicsEngineVulkan/src/PipelineStateVkImpl.cpp +++ b/Graphics/GraphicsEngineVulkan/src/PipelineStateVkImpl.cpp @@ -339,8 +339,8 @@ void CreateGraphicsPipeline(RenderDeviceVkImpl* pDevic void CreateRayTracingPipeline(RenderDeviceVkImpl* pDeviceVk, - std::vector& Stages, - const std::vector& ShaderGroups, + const std::vector& vkStages, + const std::vector& vkShaderGroups, const PipelineLayout& Layout, const PipelineStateDesc& PSODesc, const RayTracingPipelineDesc& RayTracingPipeline, @@ -356,10 +356,10 @@ void CreateRayTracingPipeline(RenderDeviceVkImpl* PipelineCI.flags = VK_PIPELINE_CREATE_DISABLE_OPTIMIZATION_BIT; #endif - PipelineCI.stageCount = static_cast(Stages.size()); - PipelineCI.pStages = Stages.data(); - PipelineCI.groupCount = static_cast(ShaderGroups.size()); - PipelineCI.pGroups = ShaderGroups.data(); + PipelineCI.stageCount = static_cast(vkStages.size()); + PipelineCI.pStages = vkStages.data(); + PipelineCI.groupCount = static_cast(vkShaderGroups.size()); + PipelineCI.pGroups = vkShaderGroups.data(); PipelineCI.maxPipelineRayRecursionDepth = RayTracingPipeline.MaxRecursionDepth; PipelineCI.pLibraryInfo = nullptr; PipelineCI.pLibraryInterface = nullptr; @@ -764,14 +764,14 @@ PipelineStateVkImpl::PipelineStateVkImpl(IReferenceCounters* const auto ShaderStages = InitInternalObjects(CreateInfo, vkShaderStages, ShaderModules); - const auto ShaderGroups = BuildRTShaderGroupDescription(CreateInfo, m_pRayTracingPipelineData->NameToGroupIndex, ShaderStages); + const auto vkShaderGroups = BuildRTShaderGroupDescription(CreateInfo, m_pRayTracingPipelineData->NameToGroupIndex, ShaderStages); - CreateRayTracingPipeline(pDeviceVk, vkShaderStages, ShaderGroups, m_PipelineLayout, m_Desc, GetRayTracingPipelineDesc(), m_Pipeline); + CreateRayTracingPipeline(pDeviceVk, vkShaderStages, vkShaderGroups, m_PipelineLayout, m_Desc, GetRayTracingPipelineDesc(), m_Pipeline); - VERIFY(m_pRayTracingPipelineData->NameToGroupIndex.size() == ShaderGroups.size(), + VERIFY(m_pRayTracingPipelineData->NameToGroupIndex.size() == vkShaderGroups.size(), "The size of NameToGroupIndex map does not match the actual number of groups in the pipeline. This is a bug."); // Get shader group handles from the PSO. - auto err = LogicalDevice.GetRayTracingShaderGroupHandles(m_Pipeline, 0, static_cast(ShaderGroups.size()), m_pRayTracingPipelineData->ShaderDataSize, m_pRayTracingPipelineData->ShaderHandles); + auto err = LogicalDevice.GetRayTracingShaderGroupHandles(m_Pipeline, 0, static_cast(vkShaderGroups.size()), m_pRayTracingPipelineData->ShaderDataSize, m_pRayTracingPipelineData->ShaderHandles); DEV_CHECK_ERR(err == VK_SUCCESS, "Failed to get shader group handles"); (void)err; } -- cgit v1.2.3