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

Commit 1cc0d37b authored by Courtney Goeltzenleuchter's avatar Courtney Goeltzenleuchter
Browse files

loader: Fix enumerate device layer properties 

Loader was calling down the chain when is needs to
respond with aggregate data. This patch fixes
https://buganizer.corp.google.com/u/0/issues/26982782

Change-Id: I236183d5d781a6efc3d84db4a51376b8cc29664f
parent da8ca93b

vulkan/libvulkan/dispatch.tmpl

+2 −1
Original line number Diff line number Diff line
@@ -465,7 +465,7 @@ bool LoadDriverDispatchTable(VkInstance instance, 
{{define "IsInstanceDispatched"}}

  {{AssertType $ "Function"}}

  {{if and (Macro "IsFunctionSupported" $) (eq (Macro "Vtbl" $) "Instance")}}

    {{if (ne $.Name "vkGetInstanceProcAddr")}}true{{end}}

    {{if and (ne $.Name "vkEnumerateDeviceLayerProperties") (ne $.Name "vkGetInstanceProcAddr")}}true{{end}}

  {{end}}

{{end}}
@@ -561,6 +561,7 @@ bool LoadDriverDispatchTable(VkInstance instance, 
  {{else if eq $.Name "vkGetDeviceQueue"}}true

  {{else if eq $.Name "vkAllocateCommandBuffers"}}true

  {{else if eq $.Name "vkCreateDevice"}}true

  {{else if eq $.Name "vkEnumerateDeviceLayerProperties"}}true



  {{/* vkDestroy for dispatchable objects needs to handle VK_NULL_HANDLE;

       trying to dispatch through that would crash. */}}

vulkan/libvulkan/dispatch_gen.cpp

+2 −12
Original line number Diff line number Diff line
@@ -215,6 +215,7 @@ const NameProc kLoaderTopProcs[] = { 
    {"vkCreateInstance", reinterpret_cast<PFN_vkVoidFunction>(static_cast<PFN_vkCreateInstance>(CreateInstance_Top))},

    {"vkDestroyDevice", reinterpret_cast<PFN_vkVoidFunction>(static_cast<PFN_vkDestroyDevice>(DestroyDevice_Top))},

    {"vkDestroyInstance", reinterpret_cast<PFN_vkVoidFunction>(static_cast<PFN_vkDestroyInstance>(DestroyInstance_Top))},

    {"vkEnumerateDeviceLayerProperties", reinterpret_cast<PFN_vkVoidFunction>(static_cast<PFN_vkEnumerateDeviceLayerProperties>(EnumerateDeviceLayerProperties_Top))},

    {"vkEnumerateInstanceExtensionProperties", reinterpret_cast<PFN_vkVoidFunction>(static_cast<PFN_vkEnumerateInstanceExtensionProperties>(EnumerateInstanceExtensionProperties_Top))},

    {"vkEnumerateInstanceLayerProperties", reinterpret_cast<PFN_vkVoidFunction>(static_cast<PFN_vkEnumerateInstanceLayerProperties>(EnumerateInstanceLayerProperties_Top))},

    {"vkGetDeviceProcAddr", reinterpret_cast<PFN_vkVoidFunction>(static_cast<PFN_vkGetDeviceProcAddr>(GetDeviceProcAddr_Top))},
@@ -296,7 +297,6 @@ const NameOffset kInstanceDispatchOffsets[] = { 
    {"vkDestroyInstance", offsetof(InstanceDispatchTable, DestroyInstance)},

    {"vkDestroySurfaceKHR", offsetof(InstanceDispatchTable, DestroySurfaceKHR)},

    {"vkEnumerateDeviceExtensionProperties", offsetof(InstanceDispatchTable, EnumerateDeviceExtensionProperties)},

    {"vkEnumerateDeviceLayerProperties", offsetof(InstanceDispatchTable, EnumerateDeviceLayerProperties)},

    {"vkEnumeratePhysicalDevices", offsetof(InstanceDispatchTable, EnumeratePhysicalDevices)},

    {"vkGetPhysicalDeviceFeatures", offsetof(InstanceDispatchTable, GetPhysicalDeviceFeatures)},

    {"vkGetPhysicalDeviceFormatProperties", offsetof(InstanceDispatchTable, GetPhysicalDeviceFormatProperties)},
@@ -522,11 +522,6 @@ bool LoadInstanceDispatchTable(VkInstance instance, 
        ALOGE("missing instance proc: %s", "vkCreateDevice");

        success = false;

    }

    dispatch.EnumerateDeviceLayerProperties = reinterpret_cast<PFN_vkEnumerateDeviceLayerProperties>(get_proc_addr(instance, "vkEnumerateDeviceLayerProperties"));

    if (UNLIKELY(!dispatch.EnumerateDeviceLayerProperties)) {

        ALOGE("missing instance proc: %s", "vkEnumerateDeviceLayerProperties");

        success = false;

    }

    dispatch.EnumerateDeviceExtensionProperties = reinterpret_cast<PFN_vkEnumerateDeviceExtensionProperties>(get_proc_addr(instance, "vkEnumerateDeviceExtensionProperties"));

    if (UNLIKELY(!dispatch.EnumerateDeviceExtensionProperties)) {

        ALOGE("missing instance proc: %s", "vkEnumerateDeviceExtensionProperties");
@@ -1271,11 +1266,6 @@ bool LoadDriverDispatchTable(VkInstance instance, 
        ALOGE("missing driver proc: %s", "vkCreateDevice");

        success = false;

    }

    dispatch.EnumerateDeviceLayerProperties = reinterpret_cast<PFN_vkEnumerateDeviceLayerProperties>(get_proc_addr(instance, "vkEnumerateDeviceLayerProperties"));

    if (UNLIKELY(!dispatch.EnumerateDeviceLayerProperties)) {

        ALOGE("missing driver proc: %s", "vkEnumerateDeviceLayerProperties");

        success = false;

    }

    dispatch.EnumerateDeviceExtensionProperties = reinterpret_cast<PFN_vkEnumerateDeviceExtensionProperties>(get_proc_addr(instance, "vkEnumerateDeviceExtensionProperties"));

    if (UNLIKELY(!dispatch.EnumerateDeviceExtensionProperties)) {

        ALOGE("missing driver proc: %s", "vkEnumerateDeviceExtensionProperties");
@@ -1422,7 +1412,7 @@ VKAPI_ATTR VkResult vkEnumerateInstanceExtensionProperties(const char* pLayerNam 


__attribute__((visibility("default")))

VKAPI_ATTR VkResult vkEnumerateDeviceLayerProperties(VkPhysicalDevice physicalDevice, uint32_t* pPropertyCount, VkLayerProperties* pProperties) {

    return GetDispatchTable(physicalDevice).EnumerateDeviceLayerProperties(physicalDevice, pPropertyCount, pProperties);

    return EnumerateDeviceLayerProperties_Top(physicalDevice, pPropertyCount, pProperties);

}



__attribute__((visibility("default")))

vulkan/libvulkan/dispatch_gen.h

+0 −2
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ struct InstanceDispatchTable { 
    PFN_vkGetPhysicalDeviceFormatProperties GetPhysicalDeviceFormatProperties;

    PFN_vkGetPhysicalDeviceImageFormatProperties GetPhysicalDeviceImageFormatProperties;

    PFN_vkCreateDevice CreateDevice;

    PFN_vkEnumerateDeviceLayerProperties EnumerateDeviceLayerProperties;

    PFN_vkEnumerateDeviceExtensionProperties EnumerateDeviceExtensionProperties;

    PFN_vkGetPhysicalDeviceSparseImageFormatProperties GetPhysicalDeviceSparseImageFormatProperties;

    PFN_vkDestroySurfaceKHR DestroySurfaceKHR;
@@ -190,7 +189,6 @@ struct DriverDispatchTable { 
    PFN_vkGetPhysicalDeviceFormatProperties GetPhysicalDeviceFormatProperties;

    PFN_vkGetPhysicalDeviceImageFormatProperties GetPhysicalDeviceImageFormatProperties;

    PFN_vkCreateDevice CreateDevice;

    PFN_vkEnumerateDeviceLayerProperties EnumerateDeviceLayerProperties;

    PFN_vkEnumerateDeviceExtensionProperties EnumerateDeviceExtensionProperties;

    PFN_vkGetPhysicalDeviceSparseImageFormatProperties GetPhysicalDeviceSparseImageFormatProperties;

    PFN_vkCreateDebugReportCallbackEXT CreateDebugReportCallbackEXT;

vulkan/libvulkan/loader.cpp

+18 −8
Original line number Diff line number Diff line
@@ -861,15 +861,14 @@ VkResult EnumerateDeviceExtensionProperties_Bottom( 
    return *properties_count < num_extensions ? VK_INCOMPLETE : VK_SUCCESS;

}



// This is a no-op, the Top function returns the aggregate layer property

// data. This is to keep the dispatch generator happy.

VKAPI_ATTR

VkResult EnumerateDeviceLayerProperties_Bottom(VkPhysicalDevice /*pdev*/,

                                               uint32_t* properties_count,

                                               VkLayerProperties* properties) {

    uint32_t layer_count =

        EnumerateDeviceLayers(properties ? *properties_count : 0, properties);

    if (!properties || *properties_count > layer_count)

        *properties_count = layer_count;

    return *properties_count < layer_count ? VK_INCOMPLETE : VK_SUCCESS;

VkResult EnumerateDeviceLayerProperties_Bottom(

    VkPhysicalDevice /*pdev*/,

    uint32_t* /*properties_count*/,

    VkLayerProperties* /*properties*/) {

    return VK_SUCCESS;

}



VKAPI_ATTR
@@ -1238,6 +1237,17 @@ void DestroyInstance_Top(VkInstance vkinstance, 
    TeardownInstance(vkinstance, allocator);

}



VKAPI_ATTR

VkResult EnumerateDeviceLayerProperties_Top(VkPhysicalDevice /*pdev*/,

                                               uint32_t* properties_count,

                                               VkLayerProperties* properties) {

    uint32_t layer_count =

        EnumerateDeviceLayers(properties ? *properties_count : 0, properties);

    if (!properties || *properties_count > layer_count)

        *properties_count = layer_count;

    return *properties_count < layer_count ? VK_INCOMPLETE : VK_SUCCESS;

}



VKAPI_ATTR

VkResult CreateDevice_Top(VkPhysicalDevice gpu,

                          const VkDeviceCreateInfo* create_info,

vulkan/libvulkan/loader.h

+1 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ VKAPI_ATTR void DestroyInstance_Top(VkInstance instance, const VkAllocationCallb 
VKAPI_ATTR PFN_vkVoidFunction GetDeviceProcAddr_Top(VkDevice drv_device, const char* name);

VKAPI_ATTR void GetDeviceQueue_Top(VkDevice drv_device, uint32_t family, uint32_t index, VkQueue* out_queue);

VKAPI_ATTR VkResult AllocateCommandBuffers_Top(VkDevice device, const VkCommandBufferAllocateInfo* alloc_info, VkCommandBuffer* cmdbufs);

VKAPI_ATTR VkResult EnumerateDeviceLayerProperties_Top(VkPhysicalDevice pdev, uint32_t* properties_count, VkLayerProperties* properties);

VKAPI_ATTR VkResult CreateDevice_Top(VkPhysicalDevice pdev, const VkDeviceCreateInfo* create_info, const VkAllocationCallbacks* allocator, VkDevice* device_out);

VKAPI_ATTR void DestroyDevice_Top(VkDevice drv_device, const VkAllocationCallbacks* allocator);