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

radv: fix missing implementation of creating images from swapchains

Browse Source 
These pNext structs are part of VK_KHR_swapchain which is core Vulkan
1.1 but they were missing. Loosely based on ANV.

Passed WSI CTS.

Cc: 22.3 mesa-stable
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/7797
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20641>
This commit is contained in:
Samuel Pitoiset
2023-01-11 09:14:08 +01:00
committed by Marge Bot
parent 2969850d88
commit 2a5d7f4926
2 changed files with 34 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/amd/vulkan/radv_device.c
View File

@@ -6503,6 +6503,22 @@ radv_BindImageMemory2(VkDevice _device, uint32_t bindInfoCount,
RADV_FROM_HANDLE(radv_device_memory, mem, pBindInfos[i].memory);
RADV_FROM_HANDLE(radv_image, image, pBindInfos[i].image);
/* Ignore this struct on Android, we cannot access swapchain structures there. */
#ifdef RADV_USE_WSI_PLATFORM
const VkBindImageMemorySwapchainInfoKHR *swapchain_info =
vk_find_struct_const(pBindInfos[i].pNext, BIND_IMAGE_MEMORY_SWAPCHAIN_INFO_KHR);
if (swapchain_info && swapchain_info->swapchain != VK_NULL_HANDLE) {
struct radv_image *swapchain_img =
radv_image_from_handle(wsi_common_get_image(
swapchain_info->swapchain, swapchain_info->imageIndex));
image->bindings[0].bo = swapchain_img->bindings[0].bo;
image->bindings[0].offset = swapchain_img->bindings[0].offset;
continue;
}
#endif
if (mem->alloc_size) {
VkImageMemoryRequirementsInfo2 info = {
.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_REQUIREMENTS_INFO_2,

21
src/amd/vulkan/radv_image.c
View File

@@ -2413,7 +2413,7 @@ radv_image_queue_family_mask(const struct radv_image *image,
}
VKAPI_ATTR VkResult VKAPI_CALL
radv_CreateImage(VkDevice device, const VkImageCreateInfo *pCreateInfo,
radv_CreateImage(VkDevice _device, const VkImageCreateInfo *pCreateInfo,
const VkAllocationCallbacks *pAllocator, VkImage *pImage)
{
#ifdef ANDROID
@@ -2421,7 +2421,22 @@ radv_CreateImage(VkDevice device, const VkImageCreateInfo *pCreateInfo,
vk_find_struct_const(pCreateInfo->pNext, NATIVE_BUFFER_ANDROID);
if (gralloc_info)
return radv_image_from_gralloc(device, pCreateInfo, gralloc_info, pAllocator, pImage);
return radv_image_from_gralloc(_device, pCreateInfo, gralloc_info, pAllocator, pImage);
#endif
#ifdef RADV_USE_WSI_PLATFORM
/* Ignore swapchain creation info on Android. Since we don't have an implementation in Mesa,
* we're guaranteed to access an Android object incorrectly.
*/
RADV_FROM_HANDLE(radv_device, device, _device);
const VkImageSwapchainCreateInfoKHR *swapchain_info =
vk_find_struct_const(pCreateInfo->pNext, IMAGE_SWAPCHAIN_CREATE_INFO_KHR);
if (swapchain_info && swapchain_info->swapchain != VK_NULL_HANDLE) {
return wsi_common_create_swapchain_image(device->physical_device->vk.wsi_device,
pCreateInfo,
swapchain_info->swapchain,
pImage);
}
#endif
const struct wsi_image_create_info *wsi_info =
@@ -2429,7 +2444,7 @@ radv_CreateImage(VkDevice device, const VkImageCreateInfo *pCreateInfo,
bool scanout = wsi_info && wsi_info->scanout;
bool prime_blit_src = wsi_info && wsi_info->blit_src;
return radv_image_create(device,
return radv_image_create(_device,
&(struct radv_image_create_info){
.vk_info = pCreateInfo,
.scanout = scanout,