Added DRAW_FLAG_RESOURCE_BUFFERS_INTACT flag (API Version 240036)

3 files changed, 22 insertions, 11 deletions

diff --git a/Graphics/GraphicsEngineVulkan/include/PipelineLayout.h b/Graphics/GraphicsEngineVulkan/include/PipelineLayout.h
index 902dcdd4..e34ee108 100644
--- a/Graphics/GraphicsEngineVulkan/include/PipelineLayout.h
+++ b/Graphics/GraphicsEngineVulkan/include/PipelineLayout.h
@@ -90,10 +90,11 @@ public:
     {
         std::vector<VkDescriptorSet> vkSets;
         std::vector<uint32_t>        DynamicOffsets;
-        const ShaderResourceCacheVk* pResourceCache     = nullptr;
-        VkPipelineBindPoint          BindPoint          = VK_PIPELINE_BIND_POINT_MAX_ENUM;
-        Uint32                       SetCout            = 0;
-        Uint32                       DynamicOffsetCount = 0;
+        const ShaderResourceCacheVk* pResourceCache          = nullptr;
+        VkPipelineBindPoint          BindPoint               = VK_PIPELINE_BIND_POINT_MAX_ENUM;
+        Uint32                       SetCout                 = 0;
+        Uint32                       DynamicOffsetCount      = 0;
+        bool                         DynamicDescriptorsBound = false;
 #ifdef _DEBUG
         const PipelineLayout*        pDbgPipelineLayout = nullptr;
 #endif
@@ -105,16 +106,17 @@ public:
 
         void Reset()
         {
-            SetCout            = 0;
-            DynamicOffsetCount = 0;
+            pResourceCache          = nullptr;
+            BindPoint               = VK_PIPELINE_BIND_POINT_MAX_ENUM;
+            SetCout                 = 0;
+            DynamicOffsetCount      = 0;
+            DynamicDescriptorsBound = false;
+
 #ifdef _DEBUG
             // In release mode, do not clear vectors as this causes unnecessary work
             vkSets.clear();
             DynamicOffsets.clear();
-#endif
-            pResourceCache = nullptr;
-            BindPoint = VK_PIPELINE_BIND_POINT_MAX_ENUM;
-#ifdef _DEBUG
+
             pDbgPipelineLayout = nullptr;
 #endif
         }
@@ -246,6 +248,8 @@ __forceinline void PipelineLayout::BindDescriptorSetsWithDynamicOffsets(VulkanUt
                                  // dynamicOffsetCount must equal the total number of dynamic descriptors in the sets being bound (13.2.5)
                                  BindInfo.DynamicOffsetCount,
                                  BindInfo.DynamicOffsets.data());
+
+    BindInfo.DynamicDescriptorsBound = true;
 }
 
 }
diff --git a/Graphics/GraphicsEngineVulkan/src/DeviceContextVkImpl.cpp b/Graphics/GraphicsEngineVulkan/src/DeviceContextVkImpl.cpp
index 2bc18ce1..454429b8 100644
--- a/Graphics/GraphicsEngineVulkan/src/DeviceContextVkImpl.cpp
+++ b/Graphics/GraphicsEngineVulkan/src/DeviceContextVkImpl.cpp
@@ -421,7 +421,12 @@ namespace Diligent
 #endif
 
         if (m_DescrSetBindInfo.DynamicOffsetCount != 0)
-            m_pPipelineState->BindDescriptorSetsWithDynamicOffsets(GetCommandBuffer(), m_ContextId, this, m_DescrSetBindInfo);
+        {
+            if (!m_DescrSetBindInfo.DynamicDescriptorsBound || (Flags & DRAW_FLAG_RESOURCE_BUFFERS_INTACT) == 0)
+            {
+                m_pPipelineState->BindDescriptorSetsWithDynamicOffsets(GetCommandBuffer(), m_ContextId, this, m_DescrSetBindInfo);
+            }
+        }
 #if 0
 #ifdef _DEBUG
         else
diff --git a/Graphics/GraphicsEngineVulkan/src/PipelineLayout.cpp b/Graphics/GraphicsEngineVulkan/src/PipelineLayout.cpp
index b978f3c6..b3b97ec6 100644
--- a/Graphics/GraphicsEngineVulkan/src/PipelineLayout.cpp
+++ b/Graphics/GraphicsEngineVulkan/src/PipelineLayout.cpp
@@ -499,6 +499,8 @@ void PipelineLayout::PrepareDescriptorSets(DeviceContextVkImpl*          pCtxVkI
                                      0, 
                                      nullptr);
     }
+
+    BindInfo.DynamicDescriptorsBound = false;
 }
 
 }