From 380ffeb205d373608455f1f1473286c77a2d417c Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Mon, 26 Sep 2022 15:22:35 -0400 Subject: [PATCH] lavapipe: propagate shader access info across libraries cc: mesa-stable Reviewed-by: Dave Airlie Part-of: (cherry picked from commit 6db172436a71a0e70a94c39d8eddb691e95c5cfb) --- .pick_status.json | 2 +- src/gallium/frontends/lavapipe/lvp_pipeline.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index cce772edd55..a161f603c32 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -661,7 +661,7 @@ "description": "lavapipe: propagate shader access info across libraries", "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 cf523f2f81a..2a0c3bc2a5d 100644 --- a/src/gallium/frontends/lavapipe/lvp_pipeline.c +++ b/src/gallium/frontends/lavapipe/lvp_pipeline.c @@ -790,6 +790,7 @@ lvp_graphics_pipeline_init(struct lvp_pipeline *pipeline, pipeline->line_rectangular = p->line_rectangular; pipeline->last_vertex = p->last_vertex; memcpy(&pipeline->stream_output, &p->stream_output, sizeof(p->stream_output)); + memcpy(&pipeline->access, &p->access, sizeof(p->access)); } if (p->stages & VK_GRAPHICS_PIPELINE_LIBRARY_FRAGMENT_SHADER_BIT_EXT) pipeline->force_min_sample = p->force_min_sample;