anv,lavapipe,v3dv: use wsi_common_get_image
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com> (anv) Reviewed-by: Emma Anholt <emma@anholt.net> Reviewed-by: Alejandro Piñeiro <apinheiro@igalia.com> (v3dv) Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com> (lavapipe) Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14544>
This commit is contained in:
@@ -141,19 +141,8 @@ v3dv_CreateSwapchainKHR(
|
|||||||
struct v3dv_image *
|
struct v3dv_image *
|
||||||
v3dv_wsi_get_image_from_swapchain(VkSwapchainKHR swapchain, uint32_t index)
|
v3dv_wsi_get_image_from_swapchain(VkSwapchainKHR swapchain, uint32_t index)
|
||||||
{
|
{
|
||||||
uint32_t n_images = index + 1;
|
VkImage image = wsi_common_get_image(swapchain, index);
|
||||||
VkImage *images = malloc(sizeof(*images) * n_images);
|
return v3dv_image_from_handle(image);
|
||||||
VkResult result = wsi_common_get_images(swapchain, &n_images, images);
|
|
||||||
|
|
||||||
if (result != VK_SUCCESS && result != VK_INCOMPLETE) {
|
|
||||||
free(images);
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
V3DV_FROM_HANDLE(v3dv_image, image, images[index]);
|
|
||||||
free(images);
|
|
||||||
|
|
||||||
return image;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
VKAPI_ATTR VkResult VKAPI_CALL
|
VKAPI_ATTR VkResult VKAPI_CALL
|
||||||
|
@@ -111,19 +111,8 @@ struct lvp_image *
|
|||||||
lvp_swapchain_get_image(VkSwapchainKHR swapchain,
|
lvp_swapchain_get_image(VkSwapchainKHR swapchain,
|
||||||
uint32_t index)
|
uint32_t index)
|
||||||
{
|
{
|
||||||
uint32_t n_images = index + 1;
|
VkImage image = wsi_common_get_image(swapchain, index);
|
||||||
VkImage *images = malloc(sizeof(*images) * n_images);
|
return lvp_image_from_handle(image);
|
||||||
VkResult result = wsi_common_get_images(swapchain, &n_images, images);
|
|
||||||
|
|
||||||
if (result != VK_SUCCESS && result != VK_INCOMPLETE) {
|
|
||||||
free(images);
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
LVP_FROM_HANDLE(lvp_image, image, images[index]);
|
|
||||||
free(images);
|
|
||||||
|
|
||||||
return image;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static VkResult
|
static VkResult
|
||||||
|
@@ -1421,19 +1421,8 @@ static struct anv_image *
|
|||||||
anv_swapchain_get_image(VkSwapchainKHR swapchain,
|
anv_swapchain_get_image(VkSwapchainKHR swapchain,
|
||||||
uint32_t index)
|
uint32_t index)
|
||||||
{
|
{
|
||||||
uint32_t n_images = index + 1;
|
VkImage image = wsi_common_get_image(swapchain, index);
|
||||||
VkImage *images = malloc(sizeof(*images) * n_images);
|
return anv_image_from_handle(image);
|
||||||
VkResult result = wsi_common_get_images(swapchain, &n_images, images);
|
|
||||||
|
|
||||||
if (result != VK_SUCCESS && result != VK_INCOMPLETE) {
|
|
||||||
free(images);
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
ANV_FROM_HANDLE(anv_image, image, images[index]);
|
|
||||||
free(images);
|
|
||||||
|
|
||||||
return image;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static VkResult
|
static VkResult
|
||||||
|
Reference in New Issue
Block a user