Handle extension pipeline structs when reconstructing pipeline info

renderdoc/driver/vulkan/vk_hookset_defs.h

@@ -388,6 +388,7 @@
   DeclExt(EXT_full_screen_exclusive);           \
   DeclExt(EXT_hdr_metadata);                    \
   DeclExt(AMD_display_native_hdr);              \
+  DeclExt(EXT_depth_clip_enable);               \
   DeclExt(KHR_pipeline_executable_properties);  \
   DeclExt(AMD_negative_viewport_height);
 
@@ -468,6 +469,7 @@
   CheckExt(EXT_buffer_device_address, VKXX);          \
   CheckExt(EXT_hdr_metadata, VKXX);                   \
   CheckExt(AMD_display_native_hdr, VKXX);             \
+  CheckExt(EXT_depth_clip_enable, VKXX);              \
   CheckExt(KHR_pipeline_executable_properties, VKXX); \
   CheckExt(AMD_negative_viewport_height, VKXX);
 

renderdoc/driver/vulkan/vk_info.cpp

@@ -378,7 +378,7 @@ void VulkanCreationInfo::Pipeline::Init(VulkanResourceManager *resourceMan, Vulk
   if(rastStream)
     rasterizationStream = rastStream->rasterizationStream;
 
-  // VkPipelineRasterizationStateStreamCreateInfoEXT
+  // VkPipelineRasterizationDepthClipStateCreateInfoEXT
 
   // default to the opposite of depthClampEnable
   depthClipEnable = !depthClampEnable;

renderdoc/driver/vulkan/vk_overlay.cpp

@@ -718,6 +718,10 @@ ResourceId VulkanReplay::RenderOverlay(ResourceId texid, CompType typeHint, Floa
     rs->cullMode = VK_CULL_MODE_NONE;
     rs->rasterizerDiscardEnable = false;
 
+    // disable all discard rectangles
+    RemoveNextStruct(&pipeCreateInfo,
+                     VK_STRUCTURE_TYPE_PIPELINE_DISCARD_RECTANGLE_STATE_CREATE_INFO_EXT);
+
     if(m_pDriver->GetDeviceFeatures().depthClamp)
     {
       rs->depthClampEnable = true;

renderdoc/driver/vulkan/vk_shader_cache.cpp

@@ -333,7 +333,10 @@ void VulkanShaderCache::MakeGraphicsPipelineInfo(VkGraphicsPipelineCreateInfo &p
   }
 
   static VkPipelineVertexInputStateCreateInfo vi = {
-      VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO};
+      VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO,
+  };
+
+  vi.pNext = NULL;
 
   static VkVertexInputAttributeDescription viattr[128] = {};
   static VkVertexInputBindingDescription vibind[128] = {};
@@ -376,6 +379,7 @@ void VulkanShaderCache::MakeGraphicsPipelineInfo(VkGraphicsPipelineCreateInfo &p
       vibindDivisors[i].divisor = pipeInfo.vertexBindings[i].instanceDivisor;
     }
 
+    vertexDivisor.pNext = vi.pNext;
     vi.pNext = &vertexDivisor;
   }
 
@@ -391,8 +395,22 @@ void VulkanShaderCache::MakeGraphicsPipelineInfo(VkGraphicsPipelineCreateInfo &p
   static VkPipelineTessellationStateCreateInfo tess = {
       VK_STRUCTURE_TYPE_PIPELINE_TESSELLATION_STATE_CREATE_INFO};
 
+  tess.pNext = NULL;
+
   tess.patchControlPoints = pipeInfo.patchControlPoints;
 
+  static VkPipelineTessellationDomainOriginStateCreateInfo tessDomain = {
+      VK_STRUCTURE_TYPE_PIPELINE_TESSELLATION_DOMAIN_ORIGIN_STATE_CREATE_INFO,
+  };
+
+  if(m_pDriver->GetExtensions(GetRecord(m_Device)).ext_KHR_maintenance2)
+  {
+    tessDomain.domainOrigin = pipeInfo.tessellationDomainOrigin;
+
+    tessDomain.pNext = tess.pNext;
+    tess.pNext = &tessDomain;
+  }
+
   static VkPipelineViewportStateCreateInfo vp = {
       VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_STATE_CREATE_INFO};
 
@@ -416,6 +434,8 @@ void VulkanShaderCache::MakeGraphicsPipelineInfo(VkGraphicsPipelineCreateInfo &p
       VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_CREATE_INFO,
   };
 
+  rs.pNext = NULL;
+
   rs.depthClampEnable = pipeInfo.depthClampEnable;
   rs.rasterizerDiscardEnable = pipeInfo.rasterizerDiscardEnable,
   rs.polygonMode = pipeInfo.polygonMode;
@@ -435,11 +455,40 @@ void VulkanShaderCache::MakeGraphicsPipelineInfo(VkGraphicsPipelineCreateInfo &p
   {
     conservRast.conservativeRasterizationMode = pipeInfo.conservativeRasterizationMode;
     conservRast.extraPrimitiveOverestimationSize = pipeInfo.extraPrimitiveOverestimationSize;
+
+    conservRast.pNext = rs.pNext;
     rs.pNext = &conservRast;
   }
 
+  static VkPipelineRasterizationStateStreamCreateInfoEXT rastStream = {
+      VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_STREAM_CREATE_INFO_EXT,
+  };
+
+  if(m_pDriver->GetExtensions(GetRecord(m_Device)).ext_EXT_transform_feedback)
+  {
+    rastStream.rasterizationStream = pipeInfo.rasterizationStream;
+
+    rastStream.pNext = rs.pNext;
+    rs.pNext = &rastStream;
+  }
+
+  static VkPipelineRasterizationDepthClipStateCreateInfoEXT depthClipState = {
+      VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_DEPTH_CLIP_STATE_CREATE_INFO_EXT,
+  };
+
+  if(m_pDriver->GetExtensions(GetRecord(m_Device)).ext_EXT_depth_clip_enable)
+  {
+    depthClipState.depthClipEnable = pipeInfo.depthClipEnable;
+
+    depthClipState.pNext = rs.pNext;
+    rs.pNext = &depthClipState;
+  }
+
   static VkPipelineMultisampleStateCreateInfo msaa = {
-      VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO};
+      VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO,
+  };
+
+  msaa.pNext = NULL;
 
   msaa.rasterizationSamples = pipeInfo.rasterizationSamples;
   msaa.sampleShadingEnable = pipeInfo.sampleShadingEnable;
@@ -448,6 +497,23 @@ void VulkanShaderCache::MakeGraphicsPipelineInfo(VkGraphicsPipelineCreateInfo &p
   msaa.alphaToCoverageEnable = pipeInfo.alphaToCoverageEnable;
   msaa.alphaToOneEnable = pipeInfo.alphaToOneEnable;
 
+  static VkPipelineSampleLocationsStateCreateInfoEXT sampleLoc = {
+      VK_STRUCTURE_TYPE_PIPELINE_SAMPLE_LOCATIONS_STATE_CREATE_INFO_EXT,
+  };
+
+  if(m_pDriver->GetExtensions(GetRecord(m_Device)).ext_EXT_sample_locations)
+  {
+    sampleLoc.sampleLocationsEnable = pipeInfo.sampleLocations.enabled;
+    sampleLoc.sampleLocationsInfo.sampleLocationGridSize = pipeInfo.sampleLocations.gridSize;
+    sampleLoc.sampleLocationsInfo.sampleLocationsPerPixel = pipeInfo.rasterizationSamples;
+    sampleLoc.sampleLocationsInfo.sampleLocationsCount =
+        (uint32_t)pipeInfo.sampleLocations.locations.size();
+    sampleLoc.sampleLocationsInfo.pSampleLocations = pipeInfo.sampleLocations.locations.data();
+
+    sampleLoc.pNext = msaa.pNext;
+    msaa.pNext = &sampleLoc;
+  }
+
   static VkPipelineDepthStencilStateCreateInfo ds = {
       VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO};
 
@@ -522,6 +588,20 @@ void VulkanShaderCache::MakeGraphicsPipelineInfo(VkGraphicsPipelineCreateInfo &p
       0,                 // base pipeline index
   };
 
+  static VkPipelineDiscardRectangleStateCreateInfoEXT discardRects = {
+      VK_STRUCTURE_TYPE_PIPELINE_DISCARD_RECTANGLE_STATE_CREATE_INFO_EXT,
+  };
+
+  if(m_pDriver->GetExtensions(GetRecord(m_Device)).ext_EXT_discard_rectangles)
+  {
+    discardRects.discardRectangleMode = pipeInfo.discardMode;
+    discardRects.discardRectangleCount = (uint32_t)pipeInfo.discardRectangles.size();
+    discardRects.pDiscardRectangles = pipeInfo.discardRectangles.data();
+
+    discardRects.pNext = ret.pNext;
+    ret.pNext = &discardRects;
+  }
+
   // never create derivatives
   ret.flags &= ~VK_PIPELINE_CREATE_DERIVATIVE_BIT;