lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-08-08 15:51:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix state inheritance properly for library pipelines

Browse Source
This commit is contained in:
baldurk
2022-06-07 22:22:02 +01:00
parent dc7d79a50a
commit 5ff8f2c4da
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/vulkan/vk_info.cpp
+14 -8
View File
@@ -898,7 +898,7 @@ void VulkanCreationInfo::Pipeline::Init(VulkanResourceManager *resourceMan,
renderpass = pipeInfo.renderpass;
subpass = pipeInfo.subpass;
for(uint32_t i = 0; i < 5; i++)
for(uint32_t i = 0; i < 4; i++)
shaders[i] = pipeInfo.shaders[i];
vertLayout = pipeInfo.vertLayout;
@@ -933,6 +933,8 @@ void VulkanCreationInfo::Pipeline::Init(VulkanResourceManager *resourceMan,
discardRectangles = pipeInfo.discardRectangles;
discardMode = pipeInfo.discardMode;
flags |= pipeInfo.flags;
}
if(pipeInfo.libraryFlags & VK_GRAPHICS_PIPELINE_LIBRARY_FRAGMENT_SHADER_BIT_EXT)
@@ -944,13 +946,6 @@ void VulkanCreationInfo::Pipeline::Init(VulkanResourceManager *resourceMan,
fragLayout = pipeInfo.fragLayout;
rasterizationSamples = pipeInfo.rasterizationSamples;
sampleShadingEnable = pipeInfo.sampleShadingEnable;
minSampleShading = pipeInfo.minSampleShading;
sampleMask = pipeInfo.sampleMask;
alphaToCoverageEnable = pipeInfo.alphaToCoverageEnable;
alphaToOneEnable = pipeInfo.alphaToOneEnable;
sampleLocations = pipeInfo.sampleLocations;
depthTestEnable = pipeInfo.depthTestEnable;
@@ -962,6 +957,12 @@ void VulkanCreationInfo::Pipeline::Init(VulkanResourceManager *resourceMan,
back = pipeInfo.back;
minDepthBounds = pipeInfo.minDepthBounds;
maxDepthBounds = pipeInfo.maxDepthBounds;
shadingRate = pipeInfo.shadingRate;
shadingRateCombiners[0] = pipeInfo.shadingRateCombiners[0];
shadingRateCombiners[1] = pipeInfo.shadingRateCombiners[1];
flags |= pipeInfo.flags;
}
if(pipeInfo.libraryFlags & VK_GRAPHICS_PIPELINE_LIBRARY_FRAGMENT_OUTPUT_INTERFACE_BIT_EXT)
@@ -969,6 +970,9 @@ void VulkanCreationInfo::Pipeline::Init(VulkanResourceManager *resourceMan,
renderpass = pipeInfo.renderpass;
subpass = pipeInfo.subpass;
// this is duplicated in the fragment shader interface "if sample shading is enabled or
// renderpass is not VK_NULL_HANDLE", but since it must be identical in both places we just
// treat this as canonical so we don't have to figure out if that condition is satisfied.
rasterizationSamples = pipeInfo.rasterizationSamples;
sampleShadingEnable = pipeInfo.sampleShadingEnable;
minSampleShading = pipeInfo.minSampleShading;
@@ -986,6 +990,8 @@ void VulkanCreationInfo::Pipeline::Init(VulkanResourceManager *resourceMan,
colorFormats = pipeInfo.colorFormats;
depthFormat = pipeInfo.depthFormat;
stencilFormat = pipeInfo.stencilFormat;
flags |= pipeInfo.flags;
}
}
}
renderdoc/driver/vulkan/vk_shader_cache.cpp
+2
View File
@@ -963,6 +963,8 @@ void VulkanShaderCache::MakeGraphicsPipelineInfo(VkGraphicsPipelineCreateInfo &p
// never create derivatives
ret.flags &= ~VK_PIPELINE_CREATE_DERIVATIVE_BIT;
ret.flags &= ~VK_PIPELINE_CREATE_LIBRARY_BIT_KHR;
pipeCreateInfo = ret;
}