From 0f35896a60c4de02ccfc91ace18bcef4450fa4d9 Mon Sep 17 00:00:00 2001
From: azhirnov <zh1dron@gmail.com>
Date: Sat, 7 Nov 2020 22:34:49 +0300
Subject: Added ability to update AS.

---
 Graphics/GraphicsEngineD3DBase/src/ShaderResources.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'Graphics/GraphicsEngineD3DBase')

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
-- 
cgit v1.2.3