Mesa (main): zink: handle swapchain readbacks when a present is pending

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 1e3b96913ca370367ada5b8d6d38252a017b8316
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1e3b96913ca370367ada5b8d6d38252a017b8316

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Thu Apr  7 09:16:55 2022 -0400

zink: handle swapchain readbacks when a present is pending

if a present semaphore is pending, don't try to create another one

Reviewed-by: Adam Jackson <ajax at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15784>

---

 src/gallium/drivers/zink/ci/zink-lvp-fails.txt | 1 -
 src/gallium/drivers/zink/zink_kopper.c         | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/gallium/drivers/zink/ci/zink-lvp-fails.txt b/src/gallium/drivers/zink/ci/zink-lvp-fails.txt
index 4e9f99ffc20..ebb8786b37e 100644
--- a/src/gallium/drivers/zink/ci/zink-lvp-fails.txt
+++ b/src/gallium/drivers/zink/ci/zink-lvp-fails.txt
@@ -8,7 +8,6 @@ glx at glx-tfp,Fail
 spec@!opengl 1.0 at gl-1.0-drawbuffer-modes,Fail
 spec@!opengl 1.0 at gl-1.0-front-invalidate-back,Fail
 spec at arb_framebuffer_srgb@framebuffer-srgb,Crash
-spec at egl 1.4 at egl-copy-buffers,Crash
 spec at egl_chromium_sync_control@conformance,Fail
 spec at egl_chromium_sync_control@conformance at eglGetSyncValuesCHROMIUM_msc_and_sbc_test,Fail
 spec at egl_chromium_sync_control@conformance at eglGetSyncValuesCHROMIUM_ust_test,Fail
diff --git a/src/gallium/drivers/zink/zink_kopper.c b/src/gallium/drivers/zink/zink_kopper.c
index 63a3dad8067..3f10157ed09 100644
--- a/src/gallium/drivers/zink/zink_kopper.c
+++ b/src/gallium/drivers/zink/zink_kopper.c
@@ -661,7 +661,7 @@ zink_kopper_present_readback(struct zink_context *ctx, struct zink_resource *res
    VkPipelineStageFlags mask = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
    si.pWaitDstStageMask = &mask;
    VkSemaphore acquire = zink_kopper_acquire_submit(screen, res);
-   VkSemaphore present = zink_kopper_present(screen, res);
+   VkSemaphore present = res->obj->present ? res->obj->present : zink_kopper_present(screen, res);
    if (screen->threaded)
       util_queue_finish(&screen->flush_queue);
    si.waitSemaphoreCount = !!acquire;