fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 07:18:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

v3dv: implement VK_KHR_external_memory_capabilities

Browse source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6766>
This commit is contained in:
Iago Toral Quiroga 2020-01-15 10:00:11 +01:00 • committed by Marge Bot
parent 931b247a7c
commit 0fd434d977
3 changed files with 62 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/broadcom/vulkan/v3dv_device.c
View file

@ -684,6 +684,16 @@ v3dv_GetPhysicalDeviceProperties2(VkPhysicalDevice physicalDevice,
vk_foreach_struct(ext, pProperties->pNext) {
switch (ext->sType) {
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ID_PROPERTIES: {
VkPhysicalDeviceIDProperties *id_props =
(VkPhysicalDeviceIDProperties *)ext;
/* FIXME */
memset(id_props->deviceUUID, 0, VK_UUID_SIZE);
memset(id_props->driverUUID, 0, VK_UUID_SIZE);
/* The LUID is for Windows. */
id_props->deviceLUIDValid = false;
break;
}
default:
v3dv_debug_ignored_stype(ext->sType);
break;

1
src/broadcom/vulkan/v3dv_extensions.py
View file

@ -59,6 +59,7 @@ API_VERSIONS = [
MAX_API_VERSION = None # Computed later
EXTENSIONS = [
Extension('VK_KHR_external_memory_capabilities', 1, True),
Extension('VK_KHR_get_physical_device_properties2', 1, True),
Extension('VK_EXT_debug_report', 9, True),
]

51
src/broadcom/vulkan/v3dv_formats.c
View file

@ -388,6 +388,15 @@ unsupported:
return VK_ERROR_FORMAT_NOT_SUPPORTED;
}
static const VkExternalMemoryProperties prime_fd_props = {
.externalMemoryFeatures = VK_EXTERNAL_MEMORY_FEATURE_EXPORTABLE_BIT |
VK_EXTERNAL_MEMORY_FEATURE_IMPORTABLE_BIT,
.exportFromImportedHandleTypes =
VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT,
.compatibleHandleTypes =
VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT,
};
VkResult
v3dv_GetPhysicalDeviceImageFormatProperties(
VkPhysicalDevice physicalDevice,
@ -420,10 +429,15 @@ v3dv_GetPhysicalDeviceImageFormatProperties2(VkPhysicalDevice physicalDevice,
VkImageFormatProperties2 *base_props)
{
V3DV_FROM_HANDLE(v3dv_physical_device, physical_device, physicalDevice);
const VkPhysicalDeviceExternalImageFormatInfo *external_info = NULL;
VkExternalImageFormatProperties *external_props = NULL;
/* Extract input structs */
vk_foreach_struct_const(s, base_info->pNext) {
switch (s->sType) {
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_IMAGE_FORMAT_INFO:
external_info = (const void *) s;
break;
default:
v3dv_debug_ignored_stype(s->sType);
break;
@ -433,6 +447,9 @@ v3dv_GetPhysicalDeviceImageFormatProperties2(VkPhysicalDevice physicalDevice,
/* Extract output structs */
vk_foreach_struct(s, base_props->pNext) {
switch (s->sType) {
case VK_STRUCTURE_TYPE_EXTERNAL_IMAGE_FORMAT_PROPERTIES:
external_props = (void *) s;
break;
default:
v3dv_debug_ignored_stype(s->sType);
break;
@ -442,7 +459,22 @@ v3dv_GetPhysicalDeviceImageFormatProperties2(VkPhysicalDevice physicalDevice,
VkResult result =
get_image_format_properties(physical_device, base_info,
&base_props->imageFormatProperties, NULL);
if (result != VK_SUCCESS)
goto done;
if (external_info && external_info->handleType != 0) {
switch (external_info->handleType) {
case VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT:
if (external_props)
external_props->externalMemoryProperties = prime_fd_props;
break;
default:
result = VK_ERROR_FORMAT_NOT_SUPPORTED;
break;
}
}
done:
return result;
}
@ -469,3 +501,22 @@ v3dv_GetPhysicalDeviceSparseImageFormatProperties2(
{
*pPropertyCount = 0;
}
void
v3dv_GetPhysicalDeviceExternalBufferProperties(
VkPhysicalDevice physicalDevice,
const VkPhysicalDeviceExternalBufferInfo *pExternalBufferInfo,
VkExternalBufferProperties *pExternalBufferProperties)
{
switch (pExternalBufferInfo->handleType) {
case VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT:
pExternalBufferProperties->externalMemoryProperties = prime_fd_props;
return;
default: /* Unsupported */
pExternalBufferProperties->externalMemoryProperties =
(VkExternalMemoryProperties) {
.compatibleHandleTypes = pExternalBufferInfo->handleType,
};
break;
}
}