Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8d367a3 authored by Jesse Hall's avatar Jesse Hall
Browse files

libvulkan: Add VK_ANDROID_external_memory_android_hardware_buffer 

Test: build
Change-Id: Ice6ec464e91aaf42d56afaf9b11fb514076f64e9
parent e2be6b8f

vulkan/libvulkan/api_gen.cpp

+34 −0
Original line number Diff line number Diff line
@@ -128,6 +128,16 @@ VKAPI_ATTR VkResult disabledCreateAndroidSurfaceKHR(VkInstance instance, const V 
    return VK_SUCCESS;

}



VKAPI_ATTR VkResult disabledGetAndroidHardwareBufferPropertiesANDROID(VkDevice device, const struct AHardwareBuffer*, VkAndroidHardwareBufferPropertiesANDROID*) {

    driver::Logger(device).Err(device, "VK_ANDROID_external_memory_android_hardware_buffer not enabled. Exported vkGetAndroidHardwareBufferPropertiesANDROID not executed.");

    return VK_SUCCESS;

}



VKAPI_ATTR VkResult disabledGetMemoryAndroidHardwareBufferANDROID(VkDevice device, const VkMemoryGetAndroidHardwareBufferInfoANDROID*, struct AHardwareBuffer**) {

    driver::Logger(device).Err(device, "VK_ANDROID_external_memory_android_hardware_buffer not enabled. Exported vkGetMemoryAndroidHardwareBufferANDROID not executed.");

    return VK_SUCCESS;

}



// clang-format on



}  // namespace
@@ -328,6 +338,8 @@ bool InitDispatchTable( 
    INIT_PROC_EXT(KHR_swapchain, false, dev, GetDeviceGroupPresentCapabilitiesKHR);

    INIT_PROC_EXT(KHR_swapchain, false, dev, GetDeviceGroupSurfacePresentModesKHR);

    INIT_PROC_EXT(KHR_swapchain, false, dev, AcquireNextImage2KHR);

    INIT_PROC_EXT(ANDROID_external_memory_android_hardware_buffer, false, dev, GetAndroidHardwareBufferPropertiesANDROID);

    INIT_PROC_EXT(ANDROID_external_memory_android_hardware_buffer, false, dev, GetMemoryAndroidHardwareBufferANDROID);

    // clang-format on



    return success;
@@ -509,6 +521,8 @@ VKAPI_ATTR VkResult GetDeviceGroupSurfacePresentModesKHR(VkDevice device, VkSurf 
VKAPI_ATTR VkResult GetPhysicalDevicePresentRectanglesKHR(VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, uint32_t* pRectCount, VkRect2D* pRects);

VKAPI_ATTR VkResult AcquireNextImage2KHR(VkDevice device, const VkAcquireNextImageInfoKHR* pAcquireInfo, uint32_t* pImageIndex);

VKAPI_ATTR VkResult CreateAndroidSurfaceKHR(VkInstance instance, const VkAndroidSurfaceCreateInfoKHR* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface);

VKAPI_ATTR VkResult GetAndroidHardwareBufferPropertiesANDROID(VkDevice device, const struct AHardwareBuffer* buffer, VkAndroidHardwareBufferPropertiesANDROID* pProperties);

VKAPI_ATTR VkResult GetMemoryAndroidHardwareBufferANDROID(VkDevice device, const VkMemoryGetAndroidHardwareBufferInfoANDROID* pInfo, struct AHardwareBuffer** pBuffer);



VKAPI_ATTR VkResult EnumeratePhysicalDevices(VkInstance instance, uint32_t* pPhysicalDeviceCount, VkPhysicalDevice* pPhysicalDevices) {

    return GetData(instance).dispatch.EnumeratePhysicalDevices(instance, pPhysicalDeviceCount, pPhysicalDevices);
@@ -729,6 +743,7 @@ VKAPI_ATTR PFN_vkVoidFunction GetInstanceProcAddr(VkInstance instance, const cha 
        { "vkFreeCommandBuffers", reinterpret_cast<PFN_vkVoidFunction>(FreeCommandBuffers) },

        { "vkFreeDescriptorSets", reinterpret_cast<PFN_vkVoidFunction>(FreeDescriptorSets) },

        { "vkFreeMemory", reinterpret_cast<PFN_vkVoidFunction>(FreeMemory) },

        { "vkGetAndroidHardwareBufferPropertiesANDROID", reinterpret_cast<PFN_vkVoidFunction>(GetAndroidHardwareBufferPropertiesANDROID) },

        { "vkGetBufferMemoryRequirements", reinterpret_cast<PFN_vkVoidFunction>(GetBufferMemoryRequirements) },

        { "vkGetBufferMemoryRequirements2", reinterpret_cast<PFN_vkVoidFunction>(GetBufferMemoryRequirements2) },

        { "vkGetDescriptorSetLayoutSupport", reinterpret_cast<PFN_vkVoidFunction>(GetDescriptorSetLayoutSupport) },
@@ -747,6 +762,7 @@ VKAPI_ATTR PFN_vkVoidFunction GetInstanceProcAddr(VkInstance instance, const cha 
        { "vkGetImageSparseMemoryRequirements2", reinterpret_cast<PFN_vkVoidFunction>(GetImageSparseMemoryRequirements2) },

        { "vkGetImageSubresourceLayout", reinterpret_cast<PFN_vkVoidFunction>(GetImageSubresourceLayout) },

        { "vkGetInstanceProcAddr", reinterpret_cast<PFN_vkVoidFunction>(GetInstanceProcAddr) },

        { "vkGetMemoryAndroidHardwareBufferANDROID", reinterpret_cast<PFN_vkVoidFunction>(GetMemoryAndroidHardwareBufferANDROID) },

        { "vkGetPipelineCacheData", reinterpret_cast<PFN_vkVoidFunction>(GetPipelineCacheData) },

        { "vkGetQueryPoolResults", reinterpret_cast<PFN_vkVoidFunction>(GetQueryPoolResults) },

        { "vkGetRenderAreaGranularity", reinterpret_cast<PFN_vkVoidFunction>(GetRenderAreaGranularity) },
@@ -1460,6 +1476,14 @@ VKAPI_ATTR VkResult CreateAndroidSurfaceKHR(VkInstance instance, const VkAndroid 
    return GetData(instance).dispatch.CreateAndroidSurfaceKHR(instance, pCreateInfo, pAllocator, pSurface);

}



VKAPI_ATTR VkResult GetAndroidHardwareBufferPropertiesANDROID(VkDevice device, const struct AHardwareBuffer* buffer, VkAndroidHardwareBufferPropertiesANDROID* pProperties) {

    return GetData(device).dispatch.GetAndroidHardwareBufferPropertiesANDROID(device, buffer, pProperties);

}



VKAPI_ATTR VkResult GetMemoryAndroidHardwareBufferANDROID(VkDevice device, const VkMemoryGetAndroidHardwareBufferInfoANDROID* pInfo, struct AHardwareBuffer** pBuffer) {

    return GetData(device).dispatch.GetMemoryAndroidHardwareBufferANDROID(device, pInfo, pBuffer);

}





}  // anonymous namespace
@@ -2370,4 +2394,14 @@ VKAPI_ATTR VkResult vkCreateAndroidSurfaceKHR(VkInstance instance, const VkAndro 
    return vulkan::api::CreateAndroidSurfaceKHR(instance, pCreateInfo, pAllocator, pSurface);

}



__attribute__((visibility("default")))

VKAPI_ATTR VkResult vkGetAndroidHardwareBufferPropertiesANDROID(VkDevice device, const struct AHardwareBuffer* buffer, VkAndroidHardwareBufferPropertiesANDROID* pProperties) {

    return vulkan::api::GetAndroidHardwareBufferPropertiesANDROID(device, buffer, pProperties);

}



__attribute__((visibility("default")))

VKAPI_ATTR VkResult vkGetMemoryAndroidHardwareBufferANDROID(VkDevice device, const VkMemoryGetAndroidHardwareBufferInfoANDROID* pInfo, struct AHardwareBuffer** pBuffer) {

    return vulkan::api::GetMemoryAndroidHardwareBufferANDROID(device, pInfo, pBuffer);

}



// clang-format on

vulkan/libvulkan/api_gen.h

+2 −0
Original line number Diff line number Diff line
@@ -208,6 +208,8 @@ struct DeviceDispatchTable { 
    PFN_vkGetDeviceGroupPresentCapabilitiesKHR GetDeviceGroupPresentCapabilitiesKHR;

    PFN_vkGetDeviceGroupSurfacePresentModesKHR GetDeviceGroupSurfacePresentModesKHR;

    PFN_vkAcquireNextImage2KHR AcquireNextImage2KHR;

    PFN_vkGetAndroidHardwareBufferPropertiesANDROID GetAndroidHardwareBufferPropertiesANDROID;

    PFN_vkGetMemoryAndroidHardwareBufferANDROID GetMemoryAndroidHardwareBufferANDROID;

    // clang-format on

};

vulkan/libvulkan/code-generator.tmpl

+2 −1
Original line number Diff line number Diff line
@@ -702,6 +702,7 @@ VK_KHR_get_surface_capabilities2 
{{define "driver.KnownExtensions"}}

{{Macro "driver.InterceptedExtensions"}}

VK_KHR_get_physical_device_properties2

VK_ANDROID_external_memory_android_hardware_buffer

{{end}}
@@ -1160,7 +1161,6 @@ VK_KHR_get_physical_device_properties2 
------------------------------------------------------------------------------

  Reports whether an extension has functions exported by the loader.

  E.g. applications can directly link to an extension function.

  Currently only support WSI extensions this way.

------------------------------------------------------------------------------

*/}}

{{define "IsExtensionExported"}}
@@ -1168,6 +1168,7 @@ VK_KHR_get_physical_device_properties2 
  {{     if eq $ext "VK_KHR_surface"}}true

  {{else if eq $ext "VK_KHR_swapchain"}}true

  {{else if eq $ext "VK_KHR_android_surface"}}true

  {{else if eq $ext "VK_ANDROID_external_memory_android_hardware_buffer"}}true

  {{end}}

{{end}}

vulkan/libvulkan/driver_gen.cpp

+1 −0
Original line number Diff line number Diff line
@@ -457,6 +457,7 @@ ProcHook::Extension GetProcHookExtension(const char* name) { 
    if (strcmp(name, "VK_KHR_swapchain") == 0) return ProcHook::KHR_swapchain;

    if (strcmp(name, "VK_KHR_get_surface_capabilities2") == 0) return ProcHook::KHR_get_surface_capabilities2;

    if (strcmp(name, "VK_KHR_get_physical_device_properties2") == 0) return ProcHook::KHR_get_physical_device_properties2;

    if (strcmp(name, "VK_ANDROID_external_memory_android_hardware_buffer") == 0) return ProcHook::ANDROID_external_memory_android_hardware_buffer;

    // clang-format on

    return ProcHook::EXTENSION_UNKNOWN;

}

vulkan/libvulkan/driver_gen.h

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ struct ProcHook { 
        KHR_swapchain,

        KHR_get_surface_capabilities2,

        KHR_get_physical_device_properties2,

        ANDROID_external_memory_android_hardware_buffer,



        EXTENSION_CORE,  // valid bit

        EXTENSION_COUNT,