Mesa (main): zink: remove broken kopper assert
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Tue Jun 28 02:57:46 UTC 2022
Module: Mesa
Branch: main
Commit: cb306a0adb50426311d3f585c018235590647ac1
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=cb306a0adb50426311d3f585c018235590647ac1
Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date: Mon Jun 20 21:36:58 2022 -0400
zink: remove broken kopper assert
in a single-buffered scenario this can and does happen
Reviewed-by: Adam Jackson <ajax at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17149>
---
src/gallium/drivers/zink/zink_kopper.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/src/gallium/drivers/zink/zink_kopper.c b/src/gallium/drivers/zink/zink_kopper.c
index bb553d1cb66..bbec1c31072 100644
--- a/src/gallium/drivers/zink/zink_kopper.c
+++ b/src/gallium/drivers/zink/zink_kopper.c
@@ -482,7 +482,6 @@ kopper_acquire(struct zink_screen *screen, struct zink_resource *res, uint64_t t
if (ret != VK_SUCCESS)
return ret;
}
- ASSERTED unsigned prev = res->obj->dt_idx;
ret = VKSCR(AcquireNextImageKHR)(screen->dev, cdt->swapchain->swapchain, timeout, acquire, VK_NULL_HANDLE, &res->obj->dt_idx);
if (ret != VK_SUCCESS && ret != VK_SUBOPTIMAL_KHR) {
if (ret == VK_ERROR_OUT_OF_DATE_KHR) {
@@ -492,7 +491,6 @@ kopper_acquire(struct zink_screen *screen, struct zink_resource *res, uint64_t t
VKSCR(DestroySemaphore)(screen->dev, acquire, NULL);
return ret;
}
- assert(prev != res->obj->dt_idx);
break;
}
More information about the mesa-commit
mailing list