diff options
| author | azhirnov <zh1dron@gmail.com> | 2020-11-07 19:34:49 +0000 |
|---|---|---|
| committer | assiduous <assiduous@diligentgraphics.com> | 2020-11-10 03:43:28 +0000 |
| commit | 0f35896a60c4de02ccfc91ace18bcef4450fa4d9 (patch) | |
| tree | 86a772a36c6c2258949231b756970a621b69f82b /Graphics/GraphicsEngineD3DBase | |
| parent | Corrected ray rtacing vertex format handling in D3D12 (diff) | |
| download | DiligentCore-0f35896a60c4de02ccfc91ace18bcef4450fa4d9.tar.gz DiligentCore-0f35896a60c4de02ccfc91ace18bcef4450fa4d9.zip | |
Added ability to update AS.
Diffstat (limited to 'Graphics/GraphicsEngineD3DBase')
| -rw-r--r-- | Graphics/GraphicsEngineD3DBase/src/ShaderResources.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/Graphics/GraphicsEngineD3DBase/src/ShaderResources.cpp b/Graphics/GraphicsEngineD3DBase/src/ShaderResources.cpp index d0691bd2..09d27372 100644 --- a/Graphics/GraphicsEngineD3DBase/src/ShaderResources.cpp +++ b/Graphics/GraphicsEngineD3DBase/src/ShaderResources.cpp @@ -236,15 +236,16 @@ void ShaderResources::DvpVerifyResourceLayout(const PipelineResourceLayoutDesc& std::string ShadersStr; while (ShaderStages != SHADER_TYPE_UNKNOWN) { - const auto ShaderType = ShaderStages & static_cast<SHADER_TYPE>(~(static_cast<Uint32>(ShaderStages) - 1)); - const char* ShaderName = nullptr; + const auto ShaderType = ShaderStages & static_cast<SHADER_TYPE>(~(static_cast<Uint32>(ShaderStages) - 1)); + String ShaderName; for (Uint32 s = 0; s < NumShaders; ++s) { const auto& Resources = *pShaderResources[s]; if ((ShaderStages & Resources.GetShaderType()) != 0) { - ShaderName = Resources.GetShaderName(); - break; + if (ShaderName.size()) + ShaderName += ", "; + ShaderName += Resources.GetShaderName(); } } @@ -252,10 +253,10 @@ void ShaderResources::DvpVerifyResourceLayout(const PipelineResourceLayoutDesc& ShadersStr.append(", "); ShadersStr.append(GetShaderTypeLiteralName(ShaderType)); ShadersStr.append(" ("); - if (ShaderName) + if (ShaderName.size()) { ShadersStr.push_back('\''); - ShadersStr.append(ShaderName ? ShaderName : "<Not enabled in PSO>"); + ShadersStr.append(ShaderName); ShadersStr.push_back('\''); } else |