diff options
| author | Mike Blumenkrantz <michael.blumenkrantz@gmail.com> | 2023-05-08 13:55:45 -0400 |
|---|---|---|
| committer | Eric Engestrom <eric@engestrom.ch> | 2023-05-09 16:56:37 +0100 |
| commit | 1ec1c1ad1722e3cece22fafc8f901b8a63d3cfaa (patch) | |
| tree | 81667421e01aab0999df62c034fae9b4ca7449c3 | |
| parent | 2fd817966875bf6e9116082044a00abe40314604 (diff) | |
| download | mesa-1ec1c1ad1722e3cece22fafc8f901b8a63d3cfaa.tar.gz | |
zink: don't init mutable for swapchain src during blit
fixes #8993
cc: 23.1 <mesa-stable>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22876>
(cherry picked from commit b4ea6adda5878668102ac4f673b0a98950d6af5e)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/zink/zink_blit.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.pick_status.json b/.pick_status.json index 0cb2b6963ce..3b23c6570dc 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -445,7 +445,7 @@ "description": "zink: don't init mutable for swapchain src during blit", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/gallium/drivers/zink/zink_blit.c b/src/gallium/drivers/zink/zink_blit.c index 8f3e75f77d8..019a6eda785 100644 --- a/src/gallium/drivers/zink/zink_blit.c +++ b/src/gallium/drivers/zink/zink_blit.c @@ -405,7 +405,7 @@ zink_blit(struct pipe_context *pctx, zink_select_draw_vbo(ctx); } zink_blit_begin(ctx, ZINK_BLIT_SAVE_FB | ZINK_BLIT_SAVE_FS | ZINK_BLIT_SAVE_TEXTURES); - if (!needs_present_readback && info->src.format != info->src.resource->format) + if (!zink_is_swapchain(src) && info->src.format != info->src.resource->format) zink_resource_object_init_mutable(ctx, src); if (!zink_is_swapchain(dst) && info->dst.format != info->dst.resource->format) zink_resource_object_init_mutable(ctx, dst); |