Module: Mesa Branch: staging/23.1 Commit: f928e2e4b7534ce92dafebc50b56f0c51e2faa8d URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f928e2e4b7534ce92dafebc50b56f0c51e2faa8d
Author: Mike Blumenkrantz <[email protected]> Date: Wed Jul 26 16:30:56 2023 -0400 lavapipe: don't check geometry for fb attachments this is broken since surfaces always have minified geometry cc: mesa-stable Reviewed-by: Dave Airlie <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24339> (cherry picked from commit 4de7e0034ae91adcc0ae3155616659c1999e3087) --- .pick_status.json | 2 +- src/gallium/frontends/lavapipe/lvp_execute.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 561cf261663..f2b432d47ca 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -337,7 +337,7 @@ "description": "lavapipe: don't check geometry for fb attachments", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/gallium/frontends/lavapipe/lvp_execute.c b/src/gallium/frontends/lavapipe/lvp_execute.c index 0fe39e004aa..b31e3bf521e 100644 --- a/src/gallium/frontends/lavapipe/lvp_execute.c +++ b/src/gallium/frontends/lavapipe/lvp_execute.c @@ -1513,9 +1513,7 @@ static void add_img_view_surface(struct rendering_state *state, int layer_count) { if (imgv->surface) { - if (imgv->surface->width != width || - imgv->surface->height != height || - (imgv->surface->u.tex.last_layer - imgv->surface->u.tex.first_layer) != (layer_count - 1)) + if ((imgv->surface->u.tex.last_layer - imgv->surface->u.tex.first_layer) != (layer_count - 1)) pipe_surface_reference(&imgv->surface, NULL); }
