AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zink: make kopper_swapchain_image::acquired the resource that acquired it

Browse Source 
no functional changes

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27553>
This commit is contained in:
Mike Blumenkrantz
2024-02-21 16:30:15 -05:00
parent d2ed77072c
commit ae80f9ce65
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/zink/zink_kopper.c
+3 -3
View File
@@ -563,7 +563,7 @@ kopper_acquire(struct zink_screen *screen, struct zink_resource *res, uint64_t t
res->obj->image = cdt->swapchain->images[res->obj->dt_idx].image;
if (!cdt->age_locked)
zink_kopper_update_last_written(res);
cdt->swapchain->images[res->obj->dt_idx].acquired = false;
cdt->swapchain->images[res->obj->dt_idx].acquired = NULL;
if (!cdt->swapchain->images[res->obj->dt_idx].init) {
/* swapchain images are initially in the UNDEFINED layout */
res->layout = VK_IMAGE_LAYOUT_UNDEFINED;
@@ -644,7 +644,7 @@ zink_kopper_acquire_submit(struct zink_screen *screen, struct zink_resource *res
return VK_NULL_HANDLE;
}
assert(cdt->swapchain->images[res->obj->dt_idx].acquire);
cdt->swapchain->images[res->obj->dt_idx].acquired = true;
cdt->swapchain->images[res->obj->dt_idx].acquired = res;
/* this is now owned by the batch */
VkSemaphore acquire = cdt->swapchain->images[res->obj->dt_idx].acquire;
cdt->swapchain->images[res->obj->dt_idx].acquire = VK_NULL_HANDLE;
@@ -832,7 +832,7 @@ zink_kopper_present_queue(struct zink_screen *screen, struct zink_resource *res)
kopper_present(cpi, screen, -1);
}
res->obj->indefinite_acquire = false;
cdt->swapchain->images[res->obj->dt_idx].acquired = false;
cdt->swapchain->images[res->obj->dt_idx].acquired = NULL;
res->obj->dt_idx = UINT32_MAX;
}
src/gallium/drivers/zink/zink_kopper.h
+1 -1
View File
@@ -41,10 +41,10 @@ struct zink_batch_usage;
struct kopper_swapchain_image {
bool init;
bool acquired;
bool dt_has_data;
int age;
VkImage image;
struct zink_resource *acquired;
struct pipe_resource *readback;
VkSemaphore acquire;
VkImageLayout layout;