fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-27 01:50:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

zink: move to AoS for storing swapchain struct data

Browse source 
this is a bit less cumbersome

Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17149>
This commit is contained in:
Mike Blumenkrantz 2022-06-22 11:46:35 -04:00 • committed by Marge Bot
parent 983dcda16a
commit c47378fb0f
3 changed files with 24 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/gallium/drivers/zink/zink_kopper.c
View file

@ -125,12 +125,10 @@ destroy_swapchain(struct zink_screen *screen, struct kopper_swapchain *cswap)
{
if (!cswap)
return;
free(cswap->images);
free(cswap->inits);
for (unsigned i = 0; i < cswap->num_images; i++) {
VKSCR(DestroySemaphore)(screen->dev, cswap->acquires[i], NULL);
VKSCR(DestroySemaphore)(screen->dev, cswap->images[i].acquire, NULL);
}
free(cswap->acquires);
free(cswap->images);
hash_table_foreach(cswap->presents, he) {
struct util_dynarray *arr = he->data;
while (util_dynarray_contains(arr, VkSemaphore))
@ -298,12 +296,15 @@ kopper_GetSwapchainImages(struct zink_screen *screen, struct kopper_swapchain *c
zink_screen_handle_vkresult(screen, error);
if (error != VK_SUCCESS)
return error;
cswap->images = malloc(sizeof(VkImage) * cswap->num_images);
cswap->acquires = calloc(cswap->num_images, sizeof(VkSemaphore));
cswap->inits = calloc(cswap->num_images, sizeof(bool));
cswap->images = calloc(cswap->num_images, sizeof(struct kopper_swapchain_image));
cswap->presents = _mesa_hash_table_create_u32_keys(NULL);
error = VKSCR(GetSwapchainImagesKHR)(screen->dev, cswap->swapchain, &cswap->num_images, cswap->images);
zink_screen_handle_vkresult(screen, error);
VkImage images[32];
error = VKSCR(GetSwapchainImagesKHR)(screen->dev, cswap->swapchain, &cswap->num_images, images);
assert(cswap->num_images <= ARRAY_SIZE(images));
if (zink_screen_handle_vkresult(screen, error)) {
for (unsigned i = 0; i < cswap->num_images; i++)
cswap->images[i].image = images[i];
}
return error;
}
@ -495,13 +496,13 @@ kopper_acquire(struct zink_screen *screen, struct zink_resource *res, uint64_t t
break;
}
cdt->swapchain->acquires[res->obj->dt_idx] = res->obj->acquire = acquire;
res->obj->image = cdt->swapchain->images[res->obj->dt_idx];
cdt->swapchain->images[res->obj->dt_idx].acquire = res->obj->acquire = acquire;
res->obj->image = cdt->swapchain->images[res->obj->dt_idx].image;
res->obj->acquired = false;
if (!cdt->swapchain->inits[res->obj->dt_idx]) {
if (!cdt->swapchain->images[res->obj->dt_idx].init) {
/* swapchain images are initially in the UNDEFINED layout */
res->layout = VK_IMAGE_LAYOUT_UNDEFINED;
cdt->swapchain->inits[res->obj->dt_idx] = true;
cdt->swapchain->images[res->obj->dt_idx].init = true;
}
if (timeout == UINT64_MAX) {
res->obj->indefinite_acquire = true;
@ -573,7 +574,7 @@ zink_kopper_acquire_submit(struct zink_screen *screen, struct zink_resource *res
assert(res->obj->acquire);
res->obj->acquired = true;
/* this is now owned by the batch */
cdt->swapchain->acquires[res->obj->dt_idx] = VK_NULL_HANDLE;
cdt->swapchain->images[res->obj->dt_idx].acquire = VK_NULL_HANDLE;
cdt->swapchain->dt_has_data = true;
return res->obj->acquire;
}

11
src/gallium/drivers/zink/zink_kopper.h
View file

@ -29,14 +29,18 @@
#include "kopper_interface.h"
struct kopper_swapchain_image {
bool init;
VkImage image;
VkSemaphore acquire;
};
struct kopper_swapchain {
struct kopper_swapchain *next;
VkSwapchainKHR swapchain;
VkImage *images;
bool *inits;
unsigned last_present;
unsigned num_images;
VkSemaphore *acquires;
uint32_t last_present_prune;
struct hash_table *presents;
VkSwapchainCreateInfoKHR scci;
@ -44,6 +48,7 @@ struct kopper_swapchain {
unsigned max_acquires;
unsigned async_presents;
bool dt_has_data;
struct kopper_swapchain_image *images;
};
enum kopper_type {

2
src/gallium/drivers/zink/zink_surface.c
View file

@ -441,7 +441,7 @@ zink_surface_swapchain_update(struct zink_context *ctx, struct zink_surface *sur
init_surface_info(surface, res, &surface->ivci);
}
if (!surface->swapchain[res->obj->dt_idx]) {
assert(res->obj->image && cdt->swapchain->images[res->obj->dt_idx] == res->obj->image);
assert(res->obj->image && cdt->swapchain->images[res->obj->dt_idx].image == res->obj->image);
surface->ivci.image = res->obj->image;
assert(surface->ivci.image);
VKSCR(CreateImageView)(screen->dev, &surface->ivci, NULL, &surface->swapchain[res->obj->dt_idx]);