From 45ece56b7554b1a8c4dca955a59f1304ab08e9f3 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Mon, 6 Feb 2023 14:42:14 -0500 Subject: [PATCH] zink: remove duplicated gpl output blend initializations Reviewed-by: Emma Anholt Part-of: --- src/gallium/drivers/zink/zink_pipeline.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/gallium/drivers/zink/zink_pipeline.c b/src/gallium/drivers/zink/zink_pipeline.c index a9f6c0159b0..f5af023d09b 100644 --- a/src/gallium/drivers/zink/zink_pipeline.c +++ b/src/gallium/drivers/zink/zink_pipeline.c @@ -453,10 +453,6 @@ zink_create_gfx_pipeline_output(struct zink_screen *screen, struct zink_gfx_pipe blend_state.sType = VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO; if (state->rast_attachment_order) blend_state.flags |= VK_PIPELINE_COLOR_BLEND_STATE_CREATE_RASTERIZATION_ORDER_ATTACHMENT_ACCESS_BIT_EXT; - if (!screen->have_full_ds3) - blend_state.attachmentCount = state->rendering_info.colorAttachmentCount; - if (state->blend_state) - blend_state.logicOp = state->blend_state->logicop_func; VkPipelineMultisampleStateCreateInfo ms_state = {0}; ms_state.sType = VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO; @@ -496,13 +492,8 @@ zink_create_gfx_pipeline_output(struct zink_screen *screen, struct zink_gfx_pipe } } else { if (state->blend_state) { - unsigned num_attachments = state->render_pass ? - state->render_pass->state.num_rts : - state->rendering_info.colorAttachmentCount; - if (state->render_pass && state->render_pass->state.have_zsbuf) - num_attachments--; blend_state.pAttachments = state->blend_state->attachments; - blend_state.attachmentCount = num_attachments; + blend_state.attachmentCount = state->rendering_info.colorAttachmentCount; blend_state.logicOpEnable = state->blend_state->logicop_enable; blend_state.logicOp = state->blend_state->logicop_func;