fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 06:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

venus/pipeline: Ignore pViewportState::pScissors

Browse source 
Signed-off-by: Chad Versace <chadversary@chromium.org>
Reviewed-by: Yiwei Zhang <zzyiwei@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16681>
This commit is contained in:
Chad Versace 2022-07-25 14:32:25 -07:00 • committed by Marge Bot
parent d6f2915ae5
commit d39e202dac
1 changed files with 34 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/virtio/vulkan/vn_pipeline.c
View file

@ -251,6 +251,7 @@ struct vn_graphics_pipeline_create_info_fix {
bool ignore_tessellation_state; bool ignore_tessellation_state;
bool ignore_viewport_state; bool ignore_viewport_state;
bool ignore_viewports; bool ignore_viewports;
bool ignore_scissors;
bool ignore_multisample_state; bool ignore_multisample_state;
bool ignore_depth_stencil_state; bool ignore_depth_stencil_state;
bool ignore_color_blend_state; bool ignore_color_blend_state;
@ -313,6 +314,7 @@ vn_fix_graphics_pipeline_create_info(
struct { struct {
bool rasterizer_discard_enable; bool rasterizer_discard_enable;
bool viewport; bool viewport;
bool scissor;
} has_dynamic_state = { 0 }; } has_dynamic_state = { 0 };
if (info->pDynamicState) { if (info->pDynamicState) {
@ -324,6 +326,9 @@ vn_fix_graphics_pipeline_create_info(
case VK_DYNAMIC_STATE_VIEWPORT: case VK_DYNAMIC_STATE_VIEWPORT:
has_dynamic_state.viewport = true; has_dynamic_state.viewport = true;
break; break;
case VK_DYNAMIC_STATE_SCISSOR:
has_dynamic_state.scissor = true;
break;
default: default:
break; break;
} }
@ -427,6 +432,23 @@ vn_fix_graphics_pipeline_create_info(
} }
} }
/* Ignore pScissors?
* VUID-VkGraphicsPipelineCreateInfo-pDynamicStates-00748
*
* Even if pViewportState is non-null, we must not dereference it if it
* is ignored.
*/
if (!fix.ignore_viewport_state && info->pViewportState &&
info->pViewportState->pScissors) {
const bool has_dynamic_scissor =
has_pre_raster_state && has_dynamic_state.scissor;
if (has_dynamic_scissor) {
fix.ignore_scissors = true;
any_fix = true;
}
}
/* Ignore pMultisampleState? /* Ignore pMultisampleState?
* VUID-VkGraphicsPipelineCreateInfo-rasterizerDiscardEnable-00751 * VUID-VkGraphicsPipelineCreateInfo-rasterizerDiscardEnable-00751
*/ */
@ -480,11 +502,18 @@ vn_fix_graphics_pipeline_create_info(
if (fix.ignore_viewport_state) if (fix.ignore_viewport_state)
fixes->create_infos[i].pViewportState = NULL; fixes->create_infos[i].pViewportState = NULL;
if (fix.ignore_viewports && fixes->create_infos[i].pViewportState) { if (fixes->create_infos[i].pViewportState) {
fixes->viewport_state_create_infos[i] = *info->pViewportState; if (fix.ignore_viewports || fix.ignore_scissors) {
fixes->viewport_state_create_infos[i].pViewports = NULL; fixes->viewport_state_create_infos[i] = *info->pViewportState;
fixes->create_infos[i].pViewportState = fixes->create_infos[i].pViewportState =
&fixes->viewport_state_create_infos[i]; &fixes->viewport_state_create_infos[i];
}
if (fix.ignore_viewports)
fixes->viewport_state_create_infos[i].pViewports = NULL;
if (fix.ignore_scissors)
fixes->viewport_state_create_infos[i].pScissors = NULL;
} }
if (fix.ignore_multisample_state) if (fix.ignore_multisample_state)