Fix dynamic offset order when calling vkCmdBindDescriptorSets (#910)

1 files changed, 18 insertions, 3 deletions

diff --git a/src/vulkan/pipeline.cc b/src/vulkan/pipeline.cc
index 315866e..0bd3e36 100644
--- a/src/vulkan/pipeline.cc
+++ b/src/vulkan/pipeline.cc
@@ -438,11 +438,26 @@ void Pipeline::BindVkDescriptorSets(const VkPipelineLayout& pipeline_layout) {
     if (descriptor_set_info_[i].empty)
       continue;
 
-    std::vector<uint32_t> dynamic_offsets;
-
+    // Sort descriptors by binding number to get correct order of dynamic
+    // offsets.
+    typedef std::pair<uint32_t, std::vector<uint32_t>> binding_offsets_pair;
+    std::vector<binding_offsets_pair> binding_offsets;
     for (const auto& desc : descriptor_set_info_[i].descriptors) {
-      for (auto offset : desc->GetDynamicOffsets())
+      binding_offsets.push_back(
+          {desc->GetBinding(), desc->GetDynamicOffsets()});
+    }
+
+    std::sort(std::begin(binding_offsets), std::end(binding_offsets),
+              [](const binding_offsets_pair& a, const binding_offsets_pair& b) {
+                return a.first < b.first;
+              });
+
+    // Add the sorted dynamic offsets.
+    std::vector<uint32_t> dynamic_offsets;
+    for (const auto& binding_offset : binding_offsets) {
+      for (auto offset : binding_offset.second) {
         dynamic_offsets.push_back(offset);
+      }
     }
 
     device_->GetPtrs()->vkCmdBindDescriptorSets(