From 5ab0e3f0bb09bde3d06b0ea448a6e183a813e286 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Mon, 7 Mar 2022 20:20:11 -0500 Subject: [PATCH] anv: fix some dynamic rasterization discard cases in pipeline construction cc: mesa-stable Reviewed-by: Lionel Landwerlin Reviewed-by: Jason Ekstrand Part-of: --- src/intel/vulkan/anv_pipeline.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/intel/vulkan/anv_pipeline.c b/src/intel/vulkan/anv_pipeline.c index 7ebf483..c6ac879 100644 --- a/src/intel/vulkan/anv_pipeline.c +++ b/src/intel/vulkan/anv_pipeline.c @@ -2426,8 +2426,7 @@ copy_non_dynamic_state(struct anv_graphics_pipeline *pipeline, } const VkPipelineMultisampleStateCreateInfo *ms_info = - pCreateInfo->pRasterizationState->rasterizerDiscardEnable ? NULL : - pCreateInfo->pMultisampleState; + raster_discard ? NULL : pCreateInfo->pMultisampleState; if (states & ANV_CMD_DIRTY_DYNAMIC_SAMPLE_LOCATIONS) { const VkPipelineSampleLocationsStateCreateInfoEXT *sl_info = ms_info ? vk_find_struct_const(ms_info, PIPELINE_SAMPLE_LOCATIONS_STATE_CREATE_INFO_EXT) : NULL; @@ -2457,8 +2456,7 @@ copy_non_dynamic_state(struct anv_graphics_pipeline *pipeline, } if (states & ANV_CMD_DIRTY_DYNAMIC_COLOR_BLEND_STATE) { - if (!pCreateInfo->pRasterizationState->rasterizerDiscardEnable && - uses_color_att) { + if (!raster_discard && uses_color_att) { assert(pCreateInfo->pColorBlendState); const VkPipelineColorWriteCreateInfoEXT *color_write_info = vk_find_struct_const(pCreateInfo->pColorBlendState->pNext, -- 2.7.4