Fix specializing graphics routines for the pipeline layout

src/Device/PixelProcessor.cpp

@@ -19,6 +19,7 @@
 #include "Pipeline/PixelProgram.hpp"
 #include "System/Debug.hpp"
 #include "Vulkan/VkImageView.hpp"
+#include "Vulkan/VkPipelineLayout.hpp"
 
 #include <cstring>
 
@@ -99,10 +100,12 @@ const PixelProcessor::State PixelProcessor::update(const Context *context) const
 	if(context->pixelShader)
 	{
 		state.shaderID = context->pixelShader->getSerialID();
+		state.pipelineLayoutIdentifier = context->pipelineLayout->identifier;
 	}
 	else
 	{
 		state.shaderID = 0;
+		state.pipelineLayoutIdentifier = 0;
 	}
 
 	state.alphaToCoverage = context->alphaToCoverage;

src/Device/PixelProcessor.hpp

@@ -63,6 +63,7 @@ public:
 		uint32_t computeHash();
 
 		uint64_t shaderID;
+		uint32_t pipelineLayoutIdentifier;
 
 		unsigned int numClipDistances;
 		unsigned int numCullDistances;

src/Device/VertexProcessor.cpp

@@ -18,6 +18,7 @@
 #include "Pipeline/VertexProgram.hpp"
 #include "System/Debug.hpp"
 #include "System/Math.hpp"
+#include "Vulkan/VkPipelineLayout.hpp"
 
 #include <cstring>
 
@@ -77,6 +78,7 @@ const VertexProcessor::State VertexProcessor::update(const sw::Context *context)
 	State state;
 
 	state.shaderID = context->vertexShader->getSerialID();
+	state.pipelineLayoutIdentifier = context->pipelineLayout->identifier;
 	state.robustBufferAccess = context->robustBufferAccess;
 	state.isPoint = context->topology == VK_PRIMITIVE_TOPOLOGY_POINT_LIST;
 

src/Device/VertexProcessor.hpp

@@ -63,6 +63,7 @@ public:
 		uint32_t computeHash();
 
 		uint64_t shaderID;
+		uint32_t pipelineLayoutIdentifier;
 
 		struct Input
 		{

src/Vulkan/VkPipelineLayout.cpp

@@ -13,12 +13,17 @@
 // limitations under the License.
 
 #include "VkPipelineLayout.hpp"
+
+#include <atomic>
 #include <cstring>
 
 namespace vk {
 
+static std::atomic<uint32_t> layoutIdentifierSerial = { 1 };  // Start at 1. 0 is invalid/void layout.
+
 PipelineLayout::PipelineLayout(const VkPipelineLayoutCreateInfo *pCreateInfo, void *mem)
-    : setLayoutCount(pCreateInfo->setLayoutCount)
+    : identifier(layoutIdentifierSerial++)
+    , setLayoutCount(pCreateInfo->setLayoutCount)
     , pushConstantRangeCount(pCreateInfo->pushConstantRangeCount)
 {
 	char *hostMem = reinterpret_cast<char *>(mem);

src/Vulkan/VkPipelineLayout.hpp

@@ -34,6 +34,8 @@ public:
 	// the given descriptor set.
 	uint32_t getDynamicOffsetBase(size_t descriptorSet) const;
 
+	const uint32_t identifier;
+
 private:
 	uint32_t setLayoutCount = 0;
 	DescriptorSetLayout **setLayouts = nullptr;