From da65216e9dec29e66b37210d891c1eefc1b3e268 Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Mon, 22 Feb 2021 18:41:24 +0200 Subject: [PATCH] anv: Fix wait_count missing increment If we don't wait on anything, I bet it makes the QueuePresent faster, but also completely wrong... Signed-off-by: Lionel Landwerlin Fixes: 02f94c33066eff ("anv: don't wait for completion of work on vkQueuePresent()") Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/4276 Reviewed-by: Jason Ekstrand Part-of: (cherry picked from commit b0b1bf9957380ad967e900b40027668353b71df6) --- .pick_status.json | 2 +- src/intel/vulkan/anv_wsi.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index ddcd37bd336..888d3ef0bb1 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1795,7 +1795,7 @@ "description": "anv: Fix wait_count missing increment", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "02f94c33066eff9e5de2077230affab1a1f3d063" }, diff --git a/src/intel/vulkan/anv_wsi.c b/src/intel/vulkan/anv_wsi.c index ff1a3117cb4..3c0f7bee19a 100644 --- a/src/intel/vulkan/anv_wsi.c +++ b/src/intel/vulkan/anv_wsi.c @@ -328,6 +328,7 @@ VkResult anv_QueuePresentKHR( assert(impl->type == ANV_SEMAPHORE_TYPE_DRM_SYNCOBJ); syncobjs[wait_count] = impl->syncobj; values[wait_count] = 0; + wait_count++; } int ret = 0;