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

venus: clean up vn_device_fix_create_info

Browse Source 
The extension list should be more correct now.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Reviewed-by: Yiwei Zhang <zzyiwei@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10556>
This commit is contained in:
Chia-I Wu
2021-04-30 12:53:41 -07:00
committed by Marge Bot
parent 9171b981bf
commit 390722620e
1 changed files with 45 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/virtio/vulkan/vn_device.c
View File

@@ -3095,43 +3095,71 @@ vn_device_fix_create_info(const struct vn_device *dev,
const VkAllocationCallbacks *alloc, const VkAllocationCallbacks *alloc,
VkDeviceCreateInfo *local_info) VkDeviceCreateInfo *local_info)
{ {
/* extra_exts and block_exts must not overlap */
const struct vn_physical_device *physical_dev = dev->physical_device; const struct vn_physical_device *physical_dev = dev->physical_device;
const char *extra_exts[8]; const struct vk_device_extension_table *app_exts =
const char *block_exts[8]; &dev->base.base.enabled_extensions;
/* extra_exts and block_exts must not overlap */
const char *extra_exts[16];
const char *block_exts[16];
uint32_t extra_count = 0; uint32_t extra_count = 0;
uint32_t block_count = 0; uint32_t block_count = 0;
#if defined(VN_USE_WSI_PLATFORM) || defined(ANDROID) /* fix for WSI */
if (dev->physical_device->base.base.supported_extensions const bool has_wsi =
.EXT_image_drm_format_modifier) app_exts->KHR_swapchain || app_exts->ANDROID_native_buffer;
if (has_wsi) {
if (!app_exts->EXT_image_drm_format_modifier) {
extra_exts[extra_count++] = extra_exts[extra_count++] =
VK_EXT_IMAGE_DRM_FORMAT_MODIFIER_EXTENSION_NAME; VK_EXT_IMAGE_DRM_FORMAT_MODIFIER_EXTENSION_NAME;
#endif
if (dev->base.base.enabled_extensions.ANDROID_native_buffer) { if (physical_dev->renderer_version < VK_API_VERSION_1_2 &&
block_exts[block_count++] = VK_ANDROID_NATIVE_BUFFER_EXTENSION_NAME; !app_exts->KHR_image_format_list) {
extra_exts[extra_count++] =
VK_KHR_IMAGE_FORMAT_LIST_EXTENSION_NAME;
}
}
if (!dev->base.base.enabled_extensions.EXT_queue_family_foreign && if (!app_exts->EXT_queue_family_foreign) {
dev->physical_device->renderer_extensions.EXT_queue_family_foreign)
extra_exts[extra_count++] = extra_exts[extra_count++] =
VK_EXT_QUEUE_FAMILY_FOREIGN_EXTENSION_NAME; VK_EXT_QUEUE_FAMILY_FOREIGN_EXTENSION_NAME;
} }
if (dev->base.base.enabled_extensions.KHR_external_memory_fd || if (app_exts->KHR_swapchain) {
dev->base.base.enabled_extensions.EXT_external_memory_dma_buf) { /* see vn_physical_device_get_native_extensions */
block_exts[block_count++] = VK_KHR_SWAPCHAIN_EXTENSION_NAME;
block_exts[block_count++] =
VK_KHR_SWAPCHAIN_MUTABLE_FORMAT_EXTENSION_NAME;
block_exts[block_count++] =
VK_KHR_INCREMENTAL_PRESENT_EXTENSION_NAME;
} else {
block_exts[block_count++] = VK_ANDROID_NATIVE_BUFFER_EXTENSION_NAME;
}
}
if (app_exts->KHR_external_memory_fd ||
app_exts->EXT_external_memory_dma_buf || has_wsi) {
switch (physical_dev->external_memory.renderer_handle_type) { switch (physical_dev->external_memory.renderer_handle_type) {
case VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT: case VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT:
extra_exts[extra_count++] = VK_EXT_EXTERNAL_MEMORY_DMA_BUF_EXTENSION_NAME; if (!app_exts->EXT_external_memory_dma_buf) {
extra_exts[extra_count++] =
VK_EXT_EXTERNAL_MEMORY_DMA_BUF_EXTENSION_NAME;
}
FALLTHROUGH; FALLTHROUGH;
case VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT: case VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT:
extra_exts[extra_count++] = VK_KHR_EXTERNAL_MEMORY_FD_EXTENSION_NAME; if (!app_exts->KHR_external_memory_fd) {
extra_exts[extra_count++] =
VK_KHR_EXTERNAL_MEMORY_FD_EXTENSION_NAME;
}
break; break;
default: default:
/* TODO other handle types */
break; break;
} }
} }
assert(extra_count <= ARRAY_SIZE(extra_exts));
assert(block_count <= ARRAY_SIZE(block_exts));
if (!extra_count && (!block_count || !dev_info->enabledExtensionCount)) if (!extra_count && (!block_count || !dev_info->enabledExtensionCount))
return dev_info; return dev_info;