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

anv: fix some dynamic rasterization discard cases in pipeline construction

Browse source 
cc: mesa-stable

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Jason Ekstrand <jason.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15280>
(cherry picked from commit 5ab0e3f0bb)
This commit is contained in:
Mike Blumenkrantz 2022-03-07 20:20:11 -05:00 • committed by Dylan Baker
parent 0185719f0a
commit bbdcc0d1e4
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -652,7 +652,7 @@
"description": "anv: fix some dynamic rasterization discard cases in pipeline construction", "description": "anv: fix some dynamic rasterization discard cases in pipeline construction",
"nominated": true, "nominated": true,
"nomination_type": 0, "nomination_type": 0,
"resolution": 0, "resolution": 1,
"main_sha": null, "main_sha": null,
"because_sha": null "because_sha": null
}, },

6
src/intel/vulkan/anv_pipeline.c
View file

@ -2421,8 +2421,7 @@ copy_non_dynamic_state(struct anv_graphics_pipeline *pipeline,
} }
const VkPipelineMultisampleStateCreateInfo *ms_info = const VkPipelineMultisampleStateCreateInfo *ms_info =
pCreateInfo->pRasterizationState->rasterizerDiscardEnable ? NULL : raster_discard ? NULL : pCreateInfo->pMultisampleState;
pCreateInfo->pMultisampleState;
if (states & ANV_CMD_DIRTY_DYNAMIC_SAMPLE_LOCATIONS) { if (states & ANV_CMD_DIRTY_DYNAMIC_SAMPLE_LOCATIONS) {
const VkPipelineSampleLocationsStateCreateInfoEXT *sl_info = ms_info ? const VkPipelineSampleLocationsStateCreateInfoEXT *sl_info = ms_info ?
vk_find_struct_const(ms_info, PIPELINE_SAMPLE_LOCATIONS_STATE_CREATE_INFO_EXT) : NULL; vk_find_struct_const(ms_info, PIPELINE_SAMPLE_LOCATIONS_STATE_CREATE_INFO_EXT) : NULL;
@ -2452,8 +2451,7 @@ copy_non_dynamic_state(struct anv_graphics_pipeline *pipeline,
} }
if (states & ANV_CMD_DIRTY_DYNAMIC_COLOR_BLEND_STATE) { if (states & ANV_CMD_DIRTY_DYNAMIC_COLOR_BLEND_STATE) {
if (!pCreateInfo->pRasterizationState->rasterizerDiscardEnable && if (!raster_discard && uses_color_att) {
uses_color_att) {
assert(pCreateInfo->pColorBlendState); assert(pCreateInfo->pColorBlendState);
const VkPipelineColorWriteCreateInfoEXT *color_write_info = const VkPipelineColorWriteCreateInfoEXT *color_write_info =
vk_find_struct_const(pCreateInfo->pColorBlendState->pNext, vk_find_struct_const(pCreateInfo->pColorBlendState->pNext,