From b74d3e71be4f48c673516b2d70ea9eb914049e6a Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 23 Jun 2022 10:28:16 -0400 Subject: [PATCH] lavapipe: skip post-copy pNext checking during pipeline creation for composites these values should have all been set during pipeline compositing above, so reapplying the values is at best, redundant, and at worst, broken cc: mesa-stable Reviewed-by: Dave Airlie Part-of: --- src/gallium/frontends/lavapipe/lvp_pipeline.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/gallium/frontends/lavapipe/lvp_pipeline.c b/src/gallium/frontends/lavapipe/lvp_pipeline.c index dda92404789..0e295f220b1 100644 --- a/src/gallium/frontends/lavapipe/lvp_pipeline.c +++ b/src/gallium/frontends/lavapipe/lvp_pipeline.c @@ -1443,9 +1443,8 @@ lvp_graphics_pipeline_init(struct lvp_pipeline *pipeline, } } } - } - - if (pipeline->stages & VK_GRAPHICS_PIPELINE_LIBRARY_PRE_RASTERIZATION_SHADERS_BIT_EXT) { + } else if (pipeline->stages & VK_GRAPHICS_PIPELINE_LIBRARY_PRE_RASTERIZATION_SHADERS_BIT_EXT) { + /* composite pipelines should have these values set above */ if (pipeline->graphics_create_info.pViewportState) { /* if pViewportState is null, it means rasterization is discarded, * so this is ignored