rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2024-12-03 22:24:13 +01:00
Code Issues Projects Releases Wiki Activity

[dxvk] Sanitize multisample state for fragment output libraries

Browse Source 
Validation complains about MS state being different between fragment shader
pipeline libraries and fragment output libraries on the EDS3 path.
This commit is contained in:
Philip Rebohle 2024-10-15 19:21:31 +02:00 committed by Philip Rebohle
parent 8ab6b8616b
commit f69dc96c24
1 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/dxvk/dxvk_graphics.cpp
View File

@ -401,17 +401,21 @@ namespace dxvk {
uint32_t dynamicStateCount = 0; uint32_t dynamicStateCount = 0;
std::array<VkDynamicState, 4> dynamicStates = { }; std::array<VkDynamicState, 4> dynamicStates = { };
if (m_device->features().extExtendedDynamicState3.extendedDynamicState3RasterizationSamples bool hasDynamicMultisampleState = state.msInfo.sampleShadingEnable
&& m_device->features().extExtendedDynamicState3.extendedDynamicState3SampleMask && m_device->features().extExtendedDynamicState3.extendedDynamicState3RasterizationSamples
&& state.msInfo.sampleShadingEnable) { && m_device->features().extExtendedDynamicState3.extendedDynamicState3SampleMask;
bool hasDynamicAlphaToCoverage = hasDynamicMultisampleState && state.cbUseDynamicAlphaToCoverage
&& device->features().extExtendedDynamicState3.extendedDynamicState3AlphaToCoverageEnable;
if (hasDynamicMultisampleState) {
dynamicStates[dynamicStateCount++] = VK_DYNAMIC_STATE_RASTERIZATION_SAMPLES_EXT; dynamicStates[dynamicStateCount++] = VK_DYNAMIC_STATE_RASTERIZATION_SAMPLES_EXT;
dynamicStates[dynamicStateCount++] = VK_DYNAMIC_STATE_SAMPLE_MASK_EXT; dynamicStates[dynamicStateCount++] = VK_DYNAMIC_STATE_SAMPLE_MASK_EXT;
if (device->features().extExtendedDynamicState3.extendedDynamicState3AlphaToCoverageEnable
&& state.cbUseDynamicAlphaToCoverage)
dynamicStates[dynamicStateCount++] = VK_DYNAMIC_STATE_ALPHA_TO_COVERAGE_ENABLE_EXT;
} }
if (hasDynamicAlphaToCoverage)
dynamicStates[dynamicStateCount++] = VK_DYNAMIC_STATE_ALPHA_TO_COVERAGE_ENABLE_EXT;
if (state.cbUseDynamicBlendConstants) if (state.cbUseDynamicBlendConstants)
dynamicStates[dynamicStateCount++] = VK_DYNAMIC_STATE_BLEND_CONSTANTS; dynamicStates[dynamicStateCount++] = VK_DYNAMIC_STATE_BLEND_CONSTANTS;
@ -429,6 +433,20 @@ namespace dxvk {
if (state.feedbackLoop & VK_IMAGE_ASPECT_DEPTH_BIT) if (state.feedbackLoop & VK_IMAGE_ASPECT_DEPTH_BIT)
flags |= VK_PIPELINE_CREATE_DEPTH_STENCIL_ATTACHMENT_FEEDBACK_LOOP_BIT_EXT; flags |= VK_PIPELINE_CREATE_DEPTH_STENCIL_ATTACHMENT_FEEDBACK_LOOP_BIT_EXT;
// Fix up multisample state based on dynamic state. Needed to
// silence validation errors in case we hit the full EDS3 path.
VkPipelineMultisampleStateCreateInfo msInfo = { VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO };
msInfo.sampleShadingEnable = state.msInfo.sampleShadingEnable;
msInfo.minSampleShading = state.msInfo.minSampleShading;
if (!hasDynamicMultisampleState) {
msInfo.rasterizationSamples = state.msInfo.rasterizationSamples;
msInfo.pSampleMask = state.msInfo.pSampleMask;
}
if (!hasDynamicAlphaToCoverage)
msInfo.alphaToCoverageEnable = state.msInfo.alphaToCoverageEnable;
// pNext is non-const for some reason, but this is only an input // pNext is non-const for some reason, but this is only an input
// structure, so we should be able to safely use const_cast. // structure, so we should be able to safely use const_cast.
VkGraphicsPipelineLibraryCreateInfoEXT libInfo = { VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_LIBRARY_CREATE_INFO_EXT }; VkGraphicsPipelineLibraryCreateInfoEXT libInfo = { VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_LIBRARY_CREATE_INFO_EXT };
@ -438,7 +456,7 @@ namespace dxvk {
VkGraphicsPipelineCreateInfo info = { VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO, &libInfo }; VkGraphicsPipelineCreateInfo info = { VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO, &libInfo };
info.flags = flags; info.flags = flags;
info.pColorBlendState = &state.cbInfo; info.pColorBlendState = &state.cbInfo;
info.pMultisampleState = &state.msInfo; info.pMultisampleState = &msInfo;
info.pDynamicState = &dyInfo; info.pDynamicState = &dyInfo;
info.basePipelineIndex = -1; info.basePipelineIndex = -1;