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

vulkan/wsi: Delete SW support from configure_native_image

Browse Source 
Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17388>
This commit is contained in:
Jason Ekstrand
2022-07-06 16:50:48 -05:00
parent 4c79ec1934
commit 1d0290fbfe
5 changed files with 14 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/vulkan/wsi/wsi_common_display.c
View File

@@ -1972,7 +1972,6 @@ wsi_display_surface_create_swapchain(
result = wsi_configure_native_image(&chain->base, create_info,
0, NULL, NULL,
NULL /* alloc_shm */,
&chain->base.image_info);
if (result != VK_SUCCESS) {
vk_free(allocator, chain);

54
src/vulkan/wsi/wsi_common_drm.c
View File

@@ -324,15 +324,12 @@ wsi_configure_native_image(const struct wsi_swapchain *chain,
uint32_t num_modifier_lists,
const uint32_t *num_modifiers,
const uint64_t *const *modifiers,
uint8_t *(alloc_shm)(struct wsi_image *image,
unsigned size),
struct wsi_image_info *info)
{
const struct wsi_device *wsi = chain->wsi;
VkExternalMemoryHandleTypeFlags handle_type =
wsi->sw ? VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT :
VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT;
VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT;
VkResult result = wsi_configure_image(chain, pCreateInfo, handle_type, info);
if (result != VK_SUCCESS)
@@ -451,7 +448,6 @@ wsi_configure_native_image(const struct wsi_swapchain *chain,
}
}
info->alloc_shm = alloc_shm;
info->create_mem = wsi_create_native_image_mem;
return VK_SUCCESS;
@@ -472,19 +468,6 @@ wsi_create_native_image_mem(const struct wsi_swapchain *chain,
VkMemoryRequirements reqs;
wsi->GetImageMemoryRequirements(chain->device, image->image, &reqs);
void *sw_host_ptr = NULL;
if (info->alloc_shm) {
VkSubresourceLayout layout;
wsi->GetImageSubresourceLayout(chain->device, image->image,
&(VkImageSubresource) {
.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT,
.mipLevel = 0,
.arrayLayer = 0,
}, &layout);
sw_host_ptr = info->alloc_shm(image, layout.size);
}
const struct wsi_memory_allocate_info memory_wsi_info = {
.sType = VK_STRUCTURE_TYPE_WSI_MEMORY_ALLOCATE_INFO_MESA,
.pNext = NULL,
@@ -493,8 +476,7 @@ wsi_create_native_image_mem(const struct wsi_swapchain *chain,
const VkExportMemoryAllocateInfo memory_export_info = {
.sType = VK_STRUCTURE_TYPE_EXPORT_MEMORY_ALLOCATE_INFO,
.pNext = &memory_wsi_info,
.handleTypes = wsi->sw ? VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT :
VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT,
.handleTypes = VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT,
};
const VkMemoryDedicatedAllocateInfo memory_dedicated_info = {
.sType = VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO,
@@ -502,15 +484,9 @@ wsi_create_native_image_mem(const struct wsi_swapchain *chain,
.image = image->image,
.buffer = VK_NULL_HANDLE,
};
const VkImportMemoryHostPointerInfoEXT host_ptr_info = {
.sType = VK_STRUCTURE_TYPE_IMPORT_MEMORY_HOST_POINTER_INFO_EXT,
.pNext = &memory_dedicated_info,
.pHostPointer = sw_host_ptr,
.handleType = VK_EXTERNAL_MEMORY_HANDLE_TYPE_HOST_ALLOCATION_BIT_EXT,
};
const VkMemoryAllocateInfo memory_info = {
.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO,
.pNext = sw_host_ptr ? (void *)&host_ptr_info : (void *)&memory_dedicated_info,
.pNext = &memory_dedicated_info,
.allocationSize = reqs.size,
.memoryTypeIndex =
wsi_select_device_memory_type(wsi, reqs.memoryTypeBits),
@@ -520,21 +496,19 @@ wsi_create_native_image_mem(const struct wsi_swapchain *chain,
if (result != VK_SUCCESS)
return result;
if (!wsi->sw) {
const VkMemoryGetFdInfoKHR memory_get_fd_info = {
.sType = VK_STRUCTURE_TYPE_MEMORY_GET_FD_INFO_KHR,
.pNext = NULL,
.memory = image->memory,
.handleType = VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT,
};
const VkMemoryGetFdInfoKHR memory_get_fd_info = {
.sType = VK_STRUCTURE_TYPE_MEMORY_GET_FD_INFO_KHR,
.pNext = NULL,
.memory = image->memory,
.handleType = VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT,
};
result = wsi->GetMemoryFdKHR(chain->device, &memory_get_fd_info,
&image->dma_buf_fd);
if (result != VK_SUCCESS)
return result;
}
result = wsi->GetMemoryFdKHR(chain->device, &memory_get_fd_info,
&image->dma_buf_fd);
if (result != VK_SUCCESS)
return result;
if (!wsi->sw && info->drm_mod_list.drmFormatModifierCount > 0) {
if (info->drm_mod_list.drmFormatModifierCount > 0) {
VkImageDrmFormatModifierPropertiesEXT image_mod_props = {
.sType = VK_STRUCTURE_TYPE_IMAGE_DRM_FORMAT_MODIFIER_PROPERTIES_EXT,
};

2
src/vulkan/wsi/wsi_common_private.h
View File

@@ -160,8 +160,6 @@ wsi_configure_native_image(const struct wsi_swapchain *chain,
uint32_t num_modifier_lists,
const uint32_t *num_modifiers,
const uint64_t *const *modifiers,
uint8_t *(alloc_shm)(struct wsi_image *image,
unsigned size),
struct wsi_image_info *info);
VkResult

1
src/vulkan/wsi/wsi_common_wayland.c
View File

@@ -1323,7 +1323,6 @@ wsi_wl_surface_create_swapchain(VkIcdSurfaceBase *icd_surface,
chain->num_drm_modifiers > 0 ? 1 : 0,
&chain->num_drm_modifiers,
&chain->drm_modifiers,
NULL /* alloc_shm */,
&chain->base.image_info);
}
if (result != VK_SUCCESS)

1
src/vulkan/wsi/wsi_common_x11.c
View File

@@ -2094,7 +2094,6 @@ x11_surface_create_swapchain(VkIcdSurfaceBase *icd_surface,
result = wsi_configure_native_image(&chain->base, pCreateInfo,
num_tranches, num_modifiers,
(const uint64_t *const *)modifiers,
NULL /* alloc_shm */,
&chain->base.image_info);
}
if (result != VK_SUCCESS)