OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zink: fix max acquired image count

Browse Source 
according to spec, the maximum number of acquired images can be calculated with

swapchain_size - VkSurfaceCapabilitiesKHR::minImageCount + 1

the previous calculation was both wrong and occurring in the wrong place,
so this corrects both issues

cc: mesa-stable

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21095>
This commit is contained in:
Mike Blumenkrantz
2023-02-03 08:40:25 -05:00
committed by Marge Bot
parent 22e91af1a7
commit 89cf0a3bdc
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gallium/drivers/zink/zink_kopper.c
View File

@@ -309,7 +309,6 @@ kopper_CreateSwapchain(struct zink_screen *screen, struct kopper_displaytarget *
*result = error; *result = error;
return NULL; return NULL;
} }
cswap->max_acquires = cswap->scci.minImageCount - cdt->caps.minImageCount;
cswap->last_present = UINT32_MAX; cswap->last_present = UINT32_MAX;
*result = VK_SUCCESS; *result = VK_SUCCESS;
@@ -332,6 +331,7 @@ kopper_GetSwapchainImages(struct zink_screen *screen, struct kopper_swapchain *c
for (unsigned i = 0; i < cswap->num_images; i++) for (unsigned i = 0; i < cswap->num_images; i++)
cswap->images[i].image = images[i]; cswap->images[i].image = images[i];
} }
cswap->max_acquires = cswap->num_images - cswap->scci.minImageCount + 1;
return error; return error;
} }
@@ -508,7 +508,7 @@ kopper_acquire(struct zink_screen *screen, struct zink_resource *res, uint64_t t
res->obj->access_stage = 0; res->obj->access_stage = 0;
} }
if (timeout == UINT64_MAX && util_queue_is_initialized(&screen->flush_queue) && if (timeout == UINT64_MAX && util_queue_is_initialized(&screen->flush_queue) &&
p_atomic_read_relaxed(&cdt->swapchain->num_acquires) > cdt->swapchain->max_acquires) { p_atomic_read_relaxed(&cdt->swapchain->num_acquires) >= cdt->swapchain->max_acquires) {
util_queue_fence_wait(&cdt->present_fence); util_queue_fence_wait(&cdt->present_fence);
} }
VkResult ret; VkResult ret;