diff --git a/.pick_status.json b/.pick_status.json index df082b234a8..1c47049335e 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -616,7 +616,7 @@ "description": "zink: fix kopper_acquire return value", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "ab1941fc0e990d10e050d6e8a75fc1fa9fb75456" }, diff --git a/src/gallium/drivers/zink/zink_kopper.c b/src/gallium/drivers/zink/zink_kopper.c index e6d5156d1d3..8f7acf464f9 100644 --- a/src/gallium/drivers/zink/zink_kopper.c +++ b/src/gallium/drivers/zink/zink_kopper.c @@ -450,7 +450,7 @@ kopper_acquire(struct zink_screen *screen, struct zink_resource *res, uint64_t t { struct kopper_displaytarget *cdt = kopper_displaytarget(res->obj->dt); if (res->obj->acquire) - return true; + return VK_SUCCESS; res->obj->acquire = VK_NULL_HANDLE; VkSemaphore acquire = VK_NULL_HANDLE;