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

venus/pipeline: Ignore pViewportState::pViewports

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:26:24 -07:00 • committed by Marge Bot
parent 4ab3b40f2e
commit d6f2915ae5
1 changed files with 34 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -250,6 +250,7 @@ vn_MergePipelineCaches(VkDevice device,
struct vn_graphics_pipeline_create_info_fix {
bool ignore_tessellation_state;
bool ignore_viewport_state;
bool ignore_viewports;
bool ignore_multisample_state;
bool ignore_depth_stencil_state;
bool ignore_color_blend_state;
@ -258,6 +259,7 @@ struct vn_graphics_pipeline_create_info_fix {
/** Temporary storage for fixes in vkCreateGraphicsPipelines. */
struct vn_create_graphics_pipelines_fixes {
VkGraphicsPipelineCreateInfo *create_infos;
VkPipelineViewportStateCreateInfo *viewport_state_create_infos;
};
static struct vn_create_graphics_pipelines_fixes *
@ -266,16 +268,20 @@ vn_alloc_create_graphics_pipelines_fixes(const VkAllocationCallbacks *alloc,
{
struct vn_create_graphics_pipelines_fixes *fixes;
VkGraphicsPipelineCreateInfo *create_infos;
VkPipelineViewportStateCreateInfo *viewport_state_create_infos;
VK_MULTIALLOC(ma);
vk_multialloc_add(&ma, &fixes, __typeof__(*fixes), 1);
vk_multialloc_add(&ma, &create_infos, __typeof__(*create_infos),
info_count);
vk_multialloc_add(&ma, &viewport_state_create_infos,
__typeof__(*viewport_state_create_infos), info_count);
if (!vk_multialloc_zalloc(&ma, alloc, VK_SYSTEM_ALLOCATION_SCOPE_COMMAND))
return NULL;
fixes->create_infos = create_infos;
fixes->viewport_state_create_infos = viewport_state_create_infos;
return fixes;
}
@ -306,6 +312,7 @@ vn_fix_graphics_pipeline_create_info(
/* VkDynamicState */
struct {
bool rasterizer_discard_enable;
bool viewport;
} has_dynamic_state = { 0 };
if (info->pDynamicState) {
@ -314,6 +321,9 @@ vn_fix_graphics_pipeline_create_info(
case VK_DYNAMIC_STATE_RASTERIZER_DISCARD_ENABLE:
has_dynamic_state.rasterizer_discard_enable = true;
break;
case VK_DYNAMIC_STATE_VIEWPORT:
has_dynamic_state.viewport = true;
break;
default:
break;
}
@ -400,6 +410,23 @@ vn_fix_graphics_pipeline_create_info(
any_fix = true;
}
/* Ignore pViewports?
* VUID-VkGraphicsPipelineCreateInfo-pDynamicStates-00747
*
* Even if pViewportState is non-null, we must not dereference it if it
* is ignored.
*/
if (!fix.ignore_viewport_state && info->pViewportState &&
info->pViewportState->pViewports) {
const bool has_dynamic_viewport =
has_pre_raster_state && has_dynamic_state.viewport;
if (has_dynamic_viewport) {
fix.ignore_viewports = true;
any_fix = true;
}
}
/* Ignore pMultisampleState?
* VUID-VkGraphicsPipelineCreateInfo-rasterizerDiscardEnable-00751
*/
@ -453,6 +480,13 @@ vn_fix_graphics_pipeline_create_info(
if (fix.ignore_viewport_state)
fixes->create_infos[i].pViewportState = NULL;
if (fix.ignore_viewports && fixes->create_infos[i].pViewportState) {
fixes->viewport_state_create_infos[i] = *info->pViewportState;
fixes->viewport_state_create_infos[i].pViewports = NULL;
fixes->create_infos[i].pViewportState =
&fixes->viewport_state_create_infos[i];
}
if (fix.ignore_multisample_state)
fixes->create_infos[i].pMultisampleState = NULL;