SpirvShader: Don't abort for unused, unbound UniformConstants

src/Pipeline/SpirvShader.cpp

@@ -1345,6 +1345,7 @@ namespace sw
 				auto set = routine->getPointer(id);
 
 				auto setLayout = routine->pipelineLayout->getDescriptorSetLayout(d.DescriptorSet);
+				ASSERT_MSG(setLayout->hasBinding(d.Binding), "Descriptor set %d does not contain binding %d", int(d.DescriptorSet), int(d.Binding));
 				int bindingOffset = static_cast<int>(setLayout->getBindingOffset(d.Binding, arrayIndex));
 
 				Pointer<Byte> descriptor = set.base + bindingOffset; // BufferDescriptor*
@@ -2501,11 +2502,20 @@ namespace sw
 
 			uint32_t arrayIndex = 0;  // TODO(b/129523279)
 			auto setLayout = routine->pipelineLayout->getDescriptorSetLayout(d.DescriptorSet);
-			size_t bindingOffset = setLayout->getBindingOffset(d.Binding, arrayIndex);
-			Pointer<Byte> set = routine->descriptorSets[d.DescriptorSet];  // DescriptorSet*
-			Pointer<Byte> binding = Pointer<Byte>(set + bindingOffset);    // vk::SampledImageDescriptor*
-			auto size = 0; // Not required as this pointer is not directly used by SIMD::Read or SIMD::Write.
-			routine->createPointer(resultId, SIMD::Pointer(binding, size));
+			if (setLayout->hasBinding(d.Binding))
+			{
+				size_t bindingOffset = setLayout->getBindingOffset(d.Binding, arrayIndex);
+				Pointer<Byte> set = routine->descriptorSets[d.DescriptorSet];  // DescriptorSet*
+				Pointer<Byte> binding = Pointer<Byte>(set + bindingOffset);    // vk::SampledImageDescriptor*
+				auto size = 0; // Not required as this pointer is not directly used by SIMD::Read or SIMD::Write.
+				routine->createPointer(resultId, SIMD::Pointer(binding, size));
+			}
+			else
+			{
+				// TODO: Error if the variable with the non-existant binding is
+				// used? Or perhaps strip these unused variable declarations as
+				// a preprocess on the SPIR-V?
+			}
 			break;
 		}
 		case spv::StorageClassUniform:

src/Vulkan/VkDescriptorSetLayout.cpp

@@ -175,6 +175,18 @@ size_t DescriptorSetLayout::getBindingCount() const
 	return bindingCount;
 }
 
+bool DescriptorSetLayout::hasBinding(uint32_t binding) const
+{
+	for(uint32_t i = 0; i < bindingCount; i++)
+	{
+		if(binding == bindings[i].binding)
+		{
+			return true;
+		}
+	}
+	return false;
+}
+
 size_t DescriptorSetLayout::getBindingStride(uint32_t binding) const
 {
 	uint32_t index = getBindingIndex(binding);

src/Vulkan/VkDescriptorSetLayout.hpp

@@ -78,6 +78,9 @@ public:
 	// Returns the number of bindings in the descriptor set.
 	size_t getBindingCount() const;
 
+	// Returns true iff the given binding exists.
+	bool hasBinding(uint32_t binding) const;
+
 	// Returns the byte offset from the base address of the descriptor set for
 	// the given binding and array element within that binding.
 	size_t getBindingOffset(uint32_t binding, size_t arrayElement) const;