From ed3961215d0ef02ff8c78e9030ab85793d2880af Mon Sep 17 00:00:00 2001
From: assiduous <assiduous@diligentgraphics.com>
Date: Fri, 26 Feb 2021 13:58:20 -0800
Subject: Few updates to PipelineStateVkImpl and PipelineStateD3D12Impl

---
 .../include/PipelineResourceSignatureBase.hpp           | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'Graphics/GraphicsEngine')

diff --git a/Graphics/GraphicsEngine/include/PipelineResourceSignatureBase.hpp b/Graphics/GraphicsEngine/include/PipelineResourceSignatureBase.hpp
index 49be28cf..de000c98 100644
--- a/Graphics/GraphicsEngine/include/PipelineResourceSignatureBase.hpp
+++ b/Graphics/GraphicsEngine/include/PipelineResourceSignatureBase.hpp
@@ -220,13 +220,13 @@ public:
     }
 
     template <typename TPipelineResourceSignature>
-    static void CopyResourceSignatures(PIPELINE_TYPE                             PipelineType,
-                                       const Uint32                              SignatureCount,
-                                       IPipelineResourceSignature*               ppResourceSignatures[],
-                                       RefCntAutoPtr<TPipelineResourceSignature> DstSignatures[],
-                                       const size_t                              MaxDstSignatureCount,
-                                       Uint8&                                    DstSignatureCount)
+    static Uint32 CopyResourceSignatures(PIPELINE_TYPE                             PipelineType,
+                                         const Uint32                              SignatureCount,
+                                         IPipelineResourceSignature*               ppResourceSignatures[],
+                                         RefCntAutoPtr<TPipelineResourceSignature> DstSignatures[],
+                                         const size_t                              MaxDstSignatureCount)
     {
+        Uint32 MaxSignatureBindIndex = 0;
         for (Uint32 i = 0; i < SignatureCount; ++i)
         {
             auto* pSignature = ValidatedCast<TPipelineResourceSignature>(ppResourceSignatures[i]);
@@ -254,9 +254,10 @@ public:
             }
 #endif
 
-            DstSignatureCount    = std::max<Uint8>(DstSignatureCount, Index + 1);
-            DstSignatures[Index] = pSignature;
+            MaxSignatureBindIndex = std::max<Uint32>(MaxSignatureBindIndex, Index);
+            DstSignatures[Index]  = pSignature;
         }
+        return MaxSignatureBindIndex;
     }
 
 protected:
-- 
cgit v1.2.3