From 5aed791c133b7cee86d43542ab1ccf6d05c46e86 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Mon, 6 Jul 2020 12:16:17 +0100
Subject: [PATCH] Don't mark unused binds with 0 stageFlags

* It's a reasonable mistake for someone to have a bind they care about with 0
  stageFlags
---
 renderdoc/driver/vulkan/vk_bindless_feedback.cpp | 2 +-
 renderdoc/driver/vulkan/vk_core.cpp              | 1 +
 renderdoc/driver/vulkan/vk_debug.cpp             | 4 ++--
 renderdoc/driver/vulkan/vk_info.h                | 4 ++--
 renderdoc/driver/vulkan/vk_replay.cpp            | 1 +
 renderdoc/driver/vulkan/vk_state.cpp             | 2 +-
 6 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/renderdoc/driver/vulkan/vk_bindless_feedback.cpp b/renderdoc/driver/vulkan/vk_bindless_feedback.cpp
index 971c2cf62..200d4bdc7 100644
--- a/renderdoc/driver/vulkan/vk_bindless_feedback.cpp
+++ b/renderdoc/driver/vulkan/vk_bindless_feedback.cpp
@@ -595,7 +595,7 @@ void VulkanReplay::FetchShaderFeedback(uint32_t eventId)
         const DescSetLayout::Binding &bindData = layout.bindings[binding];
 
         // skip empty bindings
-        if(bindData.descriptorCount == 0 || bindData.stageFlags == 0)
+        if(bindData.descriptorType == VK_DESCRIPTOR_TYPE_MAX_ENUM)
           continue;
 
         // only process array bindings
diff --git a/renderdoc/driver/vulkan/vk_core.cpp b/renderdoc/driver/vulkan/vk_core.cpp
index e99af9e73..178bf76b3 100644
--- a/renderdoc/driver/vulkan/vk_core.cpp
+++ b/renderdoc/driver/vulkan/vk_core.cpp
@@ -4038,6 +4038,7 @@ void WrappedVulkan::AddUsage(VulkanDrawcallTreeNode &drawNode, rdcarray<DebugMes
               if(slot.bufferInfo.buffer != ResourceId())
                 id = slot.bufferInfo.buffer;
               break;
+            case VK_DESCRIPTOR_TYPE_MAX_ENUM: break;
             default: RDCERR("Unexpected type %d", layout.bindings[bind].descriptorType); break;
           }
 
diff --git a/renderdoc/driver/vulkan/vk_debug.cpp b/renderdoc/driver/vulkan/vk_debug.cpp
index a8fd2eb7c..124cceac1 100644
--- a/renderdoc/driver/vulkan/vk_debug.cpp
+++ b/renderdoc/driver/vulkan/vk_debug.cpp
@@ -1927,7 +1927,7 @@ void VulkanReplay::PatchReservedDescriptors(const VulkanStatePipeline &pipe,
         const DescSetLayout::Binding &bind = origLayout.bindings[b];
 
         // skip empty bindings
-        if(bind.descriptorCount == 0 || bind.stageFlags == 0)
+        if(bind.descriptorType == VK_DESCRIPTOR_TYPE_MAX_ENUM)
           continue;
 
         // make room in the pool
@@ -2123,7 +2123,7 @@ void VulkanReplay::PatchReservedDescriptors(const VulkanStatePipeline &pipe,
         const DescSetLayout::Binding &bind = origLayout.bindings[b];
 
         // skip empty bindings
-        if(bind.descriptorCount == 0 || bind.stageFlags == 0)
+        if(bind.descriptorType == VK_DESCRIPTOR_TYPE_MAX_ENUM)
           continue;
 
         DescriptorSetSlot *slot = setInfo.currentBindings[b];
diff --git a/renderdoc/driver/vulkan/vk_info.h b/renderdoc/driver/vulkan/vk_info.h
index e27e96888..de9ad9ebd 100644
--- a/renderdoc/driver/vulkan/vk_info.h
+++ b/renderdoc/driver/vulkan/vk_info.h
@@ -82,8 +82,8 @@ struct DescSetLayout
     // some elements could be untouched. We set stageFlags to 0 so the UI ignores these
     // elements
     Binding()
-        : descriptorType(VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER),
-          descriptorCount(1),
+        : descriptorType(VK_DESCRIPTOR_TYPE_MAX_ENUM),
+          descriptorCount(0),
           stageFlags(0),
           immutableSampler(NULL)
     {
diff --git a/renderdoc/driver/vulkan/vk_replay.cpp b/renderdoc/driver/vulkan/vk_replay.cpp
index fcd8cd1cb..a7364cf42 100644
--- a/renderdoc/driver/vulkan/vk_replay.cpp
+++ b/renderdoc/driver/vulkan/vk_replay.cpp
@@ -1663,6 +1663,7 @@ void VulkanReplay::SavePipelineState(uint32_t eventId)
               dst.bindings[b].descriptorCount = 1;
               dst.bindings[b].type = BindType::ConstantBuffer;
               break;
+            case VK_DESCRIPTOR_TYPE_MAX_ENUM: dst.bindings[b].type = BindType::Unknown; break;
             default: dst.bindings[b].type = BindType::Unknown; RDCERR("Unexpected descriptor type");
           }
 
diff --git a/renderdoc/driver/vulkan/vk_state.cpp b/renderdoc/driver/vulkan/vk_state.cpp
index 81140cafa..3f44b1e0c 100644
--- a/renderdoc/driver/vulkan/vk_state.cpp
+++ b/renderdoc/driver/vulkan/vk_state.cpp
@@ -455,7 +455,7 @@ void VulkanRenderState::BindDescriptorSet(WrappedVulkan *vk, const DescSetLayout
       const DescSetLayout::Binding &bind = descLayout.bindings[b];
 
       // skip if this binding isn't used
-      if(bind.descriptorCount == 0 || bind.stageFlags == 0)
+      if(bind.descriptorType == VK_DESCRIPTOR_TYPE_MAX_ENUM)
         continue;
 
       // push.dstSet; // unused for push descriptors