Fixed issues with ray tracing shader type conversion

Author: TheMostDiligent

Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp

@@ -151,12 +151,13 @@ void BuildRTPipelineDescription(const RayTracingPipelineStateCreateInfo& CreateI
             auto&       ShaderIndex = ShaderIndices[StageIdx];
 
             // shaders must be in same order as in ExtractShaders()
-            VERIFY_EXPR(Stage.Shaders[ShaderIndex] == pShader);
+            RefCntAutoPtr<ShaderD3D12Impl> pShaderD3D12{pShader, ShaderD3D12Impl::IID_InternalImpl};
+            VERIFY(pShaderD3D12, "Unexpected shader object implementation");
+            VERIFY_EXPR(Stage.Shaders[ShaderIndex] == pShaderD3D12);
 
-            auto&       LibDesc      = *TempPool.Construct<D3D12_DXIL_LIBRARY_DESC>();
-            auto&       ExportDesc   = *TempPool.Construct<D3D12_EXPORT_DESC>();
-            const auto* pShaderD3D12 = ClassPtrCast<ShaderD3D12Impl>(pShader);
-            const auto& pBlob        = Stage.ByteCodes[ShaderIndex];
+            auto&       LibDesc    = *TempPool.Construct<D3D12_DXIL_LIBRARY_DESC>();
+            auto&       ExportDesc = *TempPool.Construct<D3D12_EXPORT_DESC>();
+            const auto& pBlob      = Stage.ByteCodes[ShaderIndex];
             ++ShaderIndex;
 
             LibDesc.DXILLibrary.BytecodeLength  = pBlob->GetBufferSize();

Graphics/GraphicsEngineVulkan/src/PipelineStateVkImpl.cpp

@@ -370,7 +370,10 @@ std::vector<VkRayTracingShaderGroupCreateInfoKHR> BuildRTShaderGroupDescription(
         if (pShader == nullptr)
             return VK_SHADER_UNUSED_KHR;
 
-        const auto ShaderType = pShader->GetDesc().ShaderType;
+        RefCntAutoPtr<ShaderVkImpl> pShaderVk{const_cast<IShader*>(pShader), ShaderVkImpl::IID_InternalImpl};
+        VERIFY(pShaderVk, "Unexpected shader object implementation");
+
+        const auto ShaderType = pShaderVk->GetDesc().ShaderType;
         // Shader modules are initialized in the same order by InitPipelineShaderStages().
         uint32_t idx = 0;
         for (const auto& Stage : ShaderStages)
@@ -379,18 +382,18 @@ std::vector<VkRayTracingShaderGroupCreateInfoKHR> BuildRTShaderGroupDescription(
             {
                 for (Uint32 i = 0; i < Stage.Shaders.size(); ++i, ++idx)
                 {
-                    if (Stage.Shaders[i] == pShader)
+                    if (Stage.Shaders[i] == pShaderVk)
                         return idx;
                 }
-                UNEXPECTED("Unable to find shader '", pShader->GetDesc().Name, "' in the shader stage. This should never happen and is a bug.");
+                UNEXPECTED("Unable to find shader '", pShaderVk->GetDesc().Name, "' in the shader stage. This should never happen and is a bug.");
                 return VK_SHADER_UNUSED_KHR;
             }
             else
             {
                 idx += static_cast<Uint32>(Stage.Count());
             }
         }
-        UNEXPECTED("Unable to find corresponding shader stage for shader '", pShader->GetDesc().Name, "'. This should never happen and is a bug.");
+        UNEXPECTED("Unable to find corresponding shader stage for shader '", pShaderVk->GetDesc().Name, "'. This should never happen and is a bug.");
         return VK_SHADER_UNUSED_KHR;
     };