From a15841aa8d3f415f172477272a5da049adfd9d7b 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: (cherry picked from commit b74d3e71be4f48c673516b2d70ea9eb914049e6a) --- .pick_status.json | 2 +- src/gallium/frontends/lavapipe/lvp_pipeline.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 73f18881ded..44d932ed547 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -274,7 +274,7 @@ "description": "lavapipe: skip post-copy pNext checking during pipeline creation for composites", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/gallium/frontends/lavapipe/lvp_pipeline.c b/src/gallium/frontends/lavapipe/lvp_pipeline.c index 28166d12e68..6ff1a4bd01b 100644 --- a/src/gallium/frontends/lavapipe/lvp_pipeline.c +++ b/src/gallium/frontends/lavapipe/lvp_pipeline.c @@ -1426,9 +1426,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