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

Commit a546fef3 authored by Chris Forbes's avatar Chris Forbes Committed by Android (Google) Code Review
Browse files

Merge "vulkan: Stub/forwarding implementation of gpdp2 in nulldrv"

parents dbf27a47 86bdfbe1

vulkan/nulldrv/null_driver.cpp

+43 −9
Original line number Diff line number Diff line
@@ -269,15 +269,8 @@ VkResult EnumerateInstanceExtensionProperties( 
            layer_name);

    }



// NOTE: Change this to zero to report and extension, which can be useful

// for testing changes to the loader.

#if 1

    (void)properties;  // unused

    *count = 0;

    return VK_SUCCESS;

#else

    const VkExtensionProperties kExtensions[] = {

        {VK_EXT_DEBUG_REPORT_EXTENSION_NAME, VK_EXT_DEBUG_REPORT_SPEC_VERSION}};

        {VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME, VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_SPEC_VERSION}};

    const uint32_t kExtensionsCount =

        sizeof(kExtensions) / sizeof(kExtensions[0]);
@@ -286,7 +279,6 @@ VkResult EnumerateInstanceExtensionProperties( 
    if (properties)

        std::copy(kExtensions, kExtensions + *count, properties);

    return *count < kExtensionsCount ? VK_INCOMPLETE : VK_SUCCESS;

#endif

}



VKAPI_ATTR
@@ -310,6 +302,10 @@ VkResult CreateInstance(const VkInstanceCreateInfo* create_info, 


    for (uint32_t i = 0; i < create_info->enabledExtensionCount; i++) {

        if (strcmp(create_info->ppEnabledExtensionNames[i],

                   VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME) == 0) {

            ALOGV("instance extension '%s' requested",

                  create_info->ppEnabledExtensionNames[i]);

        } else if (strcmp(create_info->ppEnabledExtensionNames[i],

                   VK_EXT_DEBUG_REPORT_EXTENSION_NAME) == 0) {

            ALOGV("instance extension '%s' requested",

                  create_info->ppEnabledExtensionNames[i]);
@@ -514,6 +510,11 @@ void GetPhysicalDeviceProperties(VkPhysicalDevice, 
    };

}



void GetPhysicalDeviceProperties2KHR(VkPhysicalDevice physical_device,

                                  VkPhysicalDeviceProperties2KHR* properties) {

    GetPhysicalDeviceProperties(physical_device, &properties->properties);

}



void GetPhysicalDeviceQueueFamilyProperties(

    VkPhysicalDevice,

    uint32_t* count,
@@ -529,6 +530,12 @@ void GetPhysicalDeviceQueueFamilyProperties( 
    }

}



void GetPhysicalDeviceQueueFamilyProperties2KHR(VkPhysicalDevice physical_device, uint32_t* count, VkQueueFamilyProperties2KHR* properties) {

    // note: even though multiple structures, this is safe to forward in this

    // case since we only expose one queue family.

    GetPhysicalDeviceQueueFamilyProperties(physical_device, count, properties ? &properties->queueFamilyProperties : nullptr);

}



void GetPhysicalDeviceMemoryProperties(

    VkPhysicalDevice,

    VkPhysicalDeviceMemoryProperties* properties) {
@@ -544,6 +551,10 @@ void GetPhysicalDeviceMemoryProperties( 
    properties->memoryHeaps[0].flags = VK_MEMORY_HEAP_DEVICE_LOCAL_BIT;

}



void GetPhysicalDeviceMemoryProperties2KHR(VkPhysicalDevice physical_device, VkPhysicalDeviceMemoryProperties2KHR* properties) {

    GetPhysicalDeviceMemoryProperties(physical_device, &properties->memoryProperties);

}



void GetPhysicalDeviceFeatures(VkPhysicalDevice /*gpu*/,

                               VkPhysicalDeviceFeatures* features) {

    *features = VkPhysicalDeviceFeatures{
@@ -605,6 +616,10 @@ void GetPhysicalDeviceFeatures(VkPhysicalDevice /*gpu*/, 
    };

}



void GetPhysicalDeviceFeatures2KHR(VkPhysicalDevice physical_device, VkPhysicalDeviceFeatures2KHR* features) {

    GetPhysicalDeviceFeatures(physical_device, &features->features);

}



// -----------------------------------------------------------------------------

// Device
@@ -1083,11 +1098,22 @@ void GetPhysicalDeviceFormatProperties(VkPhysicalDevice physicalDevice, VkFormat 
    ALOGV("TODO: vk%s", __FUNCTION__);

}



void GetPhysicalDeviceFormatProperties2KHR(VkPhysicalDevice physicalDevice, VkFormat format, VkFormatProperties2KHR* pFormatProperties) {

    ALOGV("TODO: vk%s", __FUNCTION__);

}



VkResult GetPhysicalDeviceImageFormatProperties(VkPhysicalDevice physicalDevice, VkFormat format, VkImageType type, VkImageTiling tiling, VkImageUsageFlags usage, VkImageCreateFlags flags, VkImageFormatProperties* pImageFormatProperties) {

    ALOGV("TODO: vk%s", __FUNCTION__);

    return VK_SUCCESS;

}



VkResult GetPhysicalDeviceImageFormatProperties2KHR(VkPhysicalDevice physicalDevice,

                                                    const VkPhysicalDeviceImageFormatInfo2KHR* pImageFormatInfo,

                                                    VkImageFormatProperties2KHR* pImageFormatProperties) {

    ALOGV("TODO: vk%s", __FUNCTION__);

    return VK_SUCCESS;

}



VkResult EnumerateInstanceLayerProperties(uint32_t* pCount, VkLayerProperties* pProperties) {

    ALOGV("TODO: vk%s", __FUNCTION__);

    return VK_SUCCESS;
@@ -1140,6 +1166,14 @@ void GetPhysicalDeviceSparseImageFormatProperties(VkPhysicalDevice physicalDevic 
    ALOGV("TODO: vk%s", __FUNCTION__);

}



void GetPhysicalDeviceSparseImageFormatProperties2KHR(VkPhysicalDevice physicalDevice,

                                                      VkPhysicalDeviceSparseImageFormatInfo2KHR const* pInfo,

                                                      unsigned int* pNumProperties,

                                                      VkSparseImageFormatProperties2KHR* pProperties) {

    ALOGV("TODO: vk%s", __FUNCTION__);

}





VkResult QueueBindSparse(VkQueue queue, uint32_t bindInfoCount, const VkBindSparseInfo* pBindInfo, VkFence fence) {

    ALOGV("TODO: vk%s", __FUNCTION__);

    return VK_SUCCESS;

vulkan/nulldrv/null_driver.tmpl

+1 −0
Original line number Diff line number Diff line
@@ -205,5 +205,6 @@ PFN_vkVoidFunction GetInstanceProcAddr(const char* name) {« 
  {{$ext := index $.Arguments 0}}

  {{     if eq $ext "VK_ANDROID_native_buffer"}}true

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

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

  {{end}}

{{end}}

vulkan/nulldrv/null_driver_gen.cpp

+7 −0
Original line number Diff line number Diff line
@@ -171,12 +171,19 @@ const NameProc kInstanceProcs[] = { 
    {"vkGetImageSubresourceLayout", reinterpret_cast<PFN_vkVoidFunction>(static_cast<PFN_vkGetImageSubresourceLayout>(GetImageSubresourceLayout))},

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

    {"vkGetPhysicalDeviceFeatures", reinterpret_cast<PFN_vkVoidFunction>(static_cast<PFN_vkGetPhysicalDeviceFeatures>(GetPhysicalDeviceFeatures))},

    {"vkGetPhysicalDeviceFeatures2KHR", reinterpret_cast<PFN_vkVoidFunction>(static_cast<PFN_vkGetPhysicalDeviceFeatures2KHR>(GetPhysicalDeviceFeatures2KHR))},

    {"vkGetPhysicalDeviceFormatProperties", reinterpret_cast<PFN_vkVoidFunction>(static_cast<PFN_vkGetPhysicalDeviceFormatProperties>(GetPhysicalDeviceFormatProperties))},

    {"vkGetPhysicalDeviceFormatProperties2KHR", reinterpret_cast<PFN_vkVoidFunction>(static_cast<PFN_vkGetPhysicalDeviceFormatProperties2KHR>(GetPhysicalDeviceFormatProperties2KHR))},

    {"vkGetPhysicalDeviceImageFormatProperties", reinterpret_cast<PFN_vkVoidFunction>(static_cast<PFN_vkGetPhysicalDeviceImageFormatProperties>(GetPhysicalDeviceImageFormatProperties))},

    {"vkGetPhysicalDeviceImageFormatProperties2KHR", reinterpret_cast<PFN_vkVoidFunction>(static_cast<PFN_vkGetPhysicalDeviceImageFormatProperties2KHR>(GetPhysicalDeviceImageFormatProperties2KHR))},

    {"vkGetPhysicalDeviceMemoryProperties", reinterpret_cast<PFN_vkVoidFunction>(static_cast<PFN_vkGetPhysicalDeviceMemoryProperties>(GetPhysicalDeviceMemoryProperties))},

    {"vkGetPhysicalDeviceMemoryProperties2KHR", reinterpret_cast<PFN_vkVoidFunction>(static_cast<PFN_vkGetPhysicalDeviceMemoryProperties2KHR>(GetPhysicalDeviceMemoryProperties2KHR))},

    {"vkGetPhysicalDeviceProperties", reinterpret_cast<PFN_vkVoidFunction>(static_cast<PFN_vkGetPhysicalDeviceProperties>(GetPhysicalDeviceProperties))},

    {"vkGetPhysicalDeviceProperties2KHR", reinterpret_cast<PFN_vkVoidFunction>(static_cast<PFN_vkGetPhysicalDeviceProperties2KHR>(GetPhysicalDeviceProperties2KHR))},

    {"vkGetPhysicalDeviceQueueFamilyProperties", reinterpret_cast<PFN_vkVoidFunction>(static_cast<PFN_vkGetPhysicalDeviceQueueFamilyProperties>(GetPhysicalDeviceQueueFamilyProperties))},

    {"vkGetPhysicalDeviceQueueFamilyProperties2KHR", reinterpret_cast<PFN_vkVoidFunction>(static_cast<PFN_vkGetPhysicalDeviceQueueFamilyProperties2KHR>(GetPhysicalDeviceQueueFamilyProperties2KHR))},

    {"vkGetPhysicalDeviceSparseImageFormatProperties", reinterpret_cast<PFN_vkVoidFunction>(static_cast<PFN_vkGetPhysicalDeviceSparseImageFormatProperties>(GetPhysicalDeviceSparseImageFormatProperties))},

    {"vkGetPhysicalDeviceSparseImageFormatProperties2KHR", reinterpret_cast<PFN_vkVoidFunction>(static_cast<PFN_vkGetPhysicalDeviceSparseImageFormatProperties2KHR>(GetPhysicalDeviceSparseImageFormatProperties2KHR))},

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

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

    {"vkGetRenderAreaGranularity", reinterpret_cast<PFN_vkVoidFunction>(static_cast<PFN_vkGetRenderAreaGranularity>(GetRenderAreaGranularity))},

vulkan/nulldrv/null_driver_gen.h

+7 −0
Original line number Diff line number Diff line
@@ -172,6 +172,13 @@ VKAPI_ATTR VkResult QueueSignalReleaseImageANDROID(VkQueue queue, uint32_t waitS 
VKAPI_ATTR VkResult CreateDebugReportCallbackEXT(VkInstance instance, const VkDebugReportCallbackCreateInfoEXT* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkDebugReportCallbackEXT* pCallback);

VKAPI_ATTR void DestroyDebugReportCallbackEXT(VkInstance instance, VkDebugReportCallbackEXT callback, const VkAllocationCallbacks* pAllocator);

VKAPI_ATTR void DebugReportMessageEXT(VkInstance instance, VkDebugReportFlagsEXT flags, VkDebugReportObjectTypeEXT objectType, uint64_t object, size_t location, int32_t messageCode, const char* pLayerPrefix, const char* pMessage);

VKAPI_ATTR void GetPhysicalDeviceFeatures2KHR(VkPhysicalDevice physicalDevice, VkPhysicalDeviceFeatures2KHR* pFeatures);

VKAPI_ATTR void GetPhysicalDeviceProperties2KHR(VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties2KHR* pProperties);

VKAPI_ATTR void GetPhysicalDeviceFormatProperties2KHR(VkPhysicalDevice physicalDevice, VkFormat format, VkFormatProperties2KHR* pFormatProperties);

VKAPI_ATTR VkResult GetPhysicalDeviceImageFormatProperties2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceImageFormatInfo2KHR* pImageFormatInfo, VkImageFormatProperties2KHR* pImageFormatProperties);

VKAPI_ATTR void GetPhysicalDeviceQueueFamilyProperties2KHR(VkPhysicalDevice physicalDevice, uint32_t* pQueueFamilyPropertyCount, VkQueueFamilyProperties2KHR* pQueueFamilyProperties);

VKAPI_ATTR void GetPhysicalDeviceMemoryProperties2KHR(VkPhysicalDevice physicalDevice, VkPhysicalDeviceMemoryProperties2KHR* pMemoryProperties);

VKAPI_ATTR void GetPhysicalDeviceSparseImageFormatProperties2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSparseImageFormatInfo2KHR* pFormatInfo, uint32_t* pPropertyCount, VkSparseImageFormatProperties2KHR* pProperties);

VKAPI_ATTR VkResult GetSwapchainGrallocUsageANDROID(VkDevice device, VkFormat format, VkImageUsageFlags imageUsage, int* grallocUsage);

VKAPI_ATTR VkResult AcquireImageANDROID(VkDevice device, VkImage image, int nativeFenceFd, VkSemaphore semaphore, VkFence fence);

VKAPI_ATTR VkResult QueueSignalReleaseImageANDROID(VkQueue queue, uint32_t waitSemaphoreCount, const VkSemaphore* pWaitSemaphores, VkImage image, int* pNativeFenceFd);