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

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

vulkan: Update from version 0.202.0 to 0.203.0 

Change-Id: I21a390bd57082194f6131b118ecd6c94874d2f7f
(cherry picked from commit 5f1b8406c88d20f23e77426d4d786caca659540b)
parent 091ed9e6

vulkan/api/vulkan.api

+7 −3
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ import platform "platform.api" 


// API version (major.minor.patch)

define VERSION_MAJOR 0

define VERSION_MINOR 202

define VERSION_MINOR 203

define VERSION_PATCH 0



// API limits
@@ -49,7 +49,7 @@ define NULL_HANDLE 0 
@extension("VK_KHR_surface") define VK_KHR_SURFACE_EXTENSION_NUMBER             1

@extension("VK_KHR_surface") define VK_KHR_SURFACE_EXTENSION_NAME               "VK_KHR_surface"



@extension("VK_KHR_swapchain") define VK_KHR_SWAPCHAIN_REVISION                 64

@extension("VK_KHR_swapchain") define VK_KHR_SWAPCHAIN_REVISION                 65

@extension("VK_KHR_swapchain") define VK_KHR_SWAPCHAIN_EXTENSION_NUMBER         2

@extension("VK_KHR_swapchain") define VK_KHR_SWAPCHAIN_EXTENSION_NAME           "VK_KHR_swapchain"
@@ -653,6 +653,7 @@ enum VkResult { 
    VK_ERROR_FEATURE_NOT_PRESENT                            = 0xFFFFFFF8,

    VK_ERROR_INCOMPATIBLE_DRIVER                            = 0xFFFFFFF7,

    VK_ERROR_TOO_MANY_OBJECTS                               = 0xFFFFFFF6,

    VK_ERROR_FORMAT_NOT_SUPPORTED                           = 0xFFFFFFF5,



    //@extension("VK_KHR_surface")

    VK_ERROR_SURFACE_LOST_KHR                               = 0xC0000400,
@@ -2317,6 +2318,7 @@ class VkPresentInfoKHR { 
    u32                                         swapchainCount

    const VkSwapchainKHR*                       pSwapchains

    const u32*                                  imageIndices

    const VkResult*                             pResults

}



@extension("VK_KHR_display")
@@ -2577,7 +2579,7 @@ cmd void vkGetPhysicalDeviceFormatProperties( 
    pFormatProperties[0] = formatProperties

}



cmd void vkGetPhysicalDeviceImageFormatProperties(

cmd VkResult vkGetPhysicalDeviceImageFormatProperties(

        VkPhysicalDevice                            physicalDevice,

        VkFormat                                    format,

        VkImageType                                 type,
@@ -2589,6 +2591,8 @@ cmd void vkGetPhysicalDeviceImageFormatProperties( 


    imageFormatProperties := ?

    pImageFormatProperties[0] = imageFormatProperties



    return ?

}

vulkan/include/vulkan/vulkan.h

+16 −14
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ extern "C" { 
    ((major << 22) | (minor << 12) | patch)



// Vulkan API version supported by this file

#define VK_API_VERSION VK_MAKE_VERSION(0, 202, 0)

#define VK_API_VERSION VK_MAKE_VERSION(0, 203, 0)





#define VK_NULL_HANDLE 0
@@ -124,9 +124,10 @@ typedef enum VkResult { 
    VK_ERROR_FEATURE_NOT_PRESENT = -8,

    VK_ERROR_INCOMPATIBLE_DRIVER = -9,

    VK_ERROR_TOO_MANY_OBJECTS = -10,

    VK_RESULT_BEGIN_RANGE = VK_ERROR_TOO_MANY_OBJECTS,

    VK_ERROR_FORMAT_NOT_SUPPORTED = -11,

    VK_RESULT_BEGIN_RANGE = VK_ERROR_FORMAT_NOT_SUPPORTED,

    VK_RESULT_END_RANGE = VK_INCOMPLETE,

    VK_RESULT_RANGE_SIZE = (VK_INCOMPLETE - VK_ERROR_TOO_MANY_OBJECTS + 1),

    VK_RESULT_RANGE_SIZE = (VK_INCOMPLETE - VK_ERROR_FORMAT_NOT_SUPPORTED + 1),

    VK_RESULT_MAX_ENUM = 0x7FFFFFFF

} VkResult;
@@ -2140,7 +2141,7 @@ typedef void (VKAPI *PFN_vkDestroyInstance)(VkInstance instance, const VkAllocat 
typedef VkResult (VKAPI *PFN_vkEnumeratePhysicalDevices)(VkInstance instance, uint32_t* pPhysicalDeviceCount, VkPhysicalDevice* pPhysicalDevices);

typedef void (VKAPI *PFN_vkGetPhysicalDeviceFeatures)(VkPhysicalDevice physicalDevice, VkPhysicalDeviceFeatures* pFeatures);

typedef void (VKAPI *PFN_vkGetPhysicalDeviceFormatProperties)(VkPhysicalDevice physicalDevice, VkFormat format, VkFormatProperties* pFormatProperties);

typedef void (VKAPI *PFN_vkGetPhysicalDeviceImageFormatProperties)(VkPhysicalDevice physicalDevice, VkFormat format, VkImageType type, VkImageTiling tiling, VkImageUsageFlags usage, VkImageCreateFlags flags, VkImageFormatProperties* pImageFormatProperties);

typedef VkResult (VKAPI *PFN_vkGetPhysicalDeviceImageFormatProperties)(VkPhysicalDevice physicalDevice, VkFormat format, VkImageType type, VkImageTiling tiling, VkImageUsageFlags usage, VkImageCreateFlags flags, VkImageFormatProperties* pImageFormatProperties);

typedef void (VKAPI *PFN_vkGetPhysicalDeviceProperties)(VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties* pProperties);

typedef void (VKAPI *PFN_vkGetPhysicalDeviceQueueFamilyProperties)(VkPhysicalDevice physicalDevice, uint32_t* pQueueFamilyPropertyCount, VkQueueFamilyProperties* pQueueFamilyProperties);

typedef void (VKAPI *PFN_vkGetPhysicalDeviceMemoryProperties)(VkPhysicalDevice physicalDevice, VkPhysicalDeviceMemoryProperties* pMemoryProperties);
@@ -2297,7 +2298,7 @@ void VKAPI vkGetPhysicalDeviceFormatProperties( 
    VkFormat                                    format,

    VkFormatProperties*                         pFormatProperties);



void VKAPI vkGetPhysicalDeviceImageFormatProperties(

VkResult VKAPI vkGetPhysicalDeviceImageFormatProperties(

    VkPhysicalDevice                            physicalDevice,

    VkFormat                                    format,

    VkImageType                                 type,
@@ -3185,7 +3186,7 @@ VkResult VKAPI vkGetPhysicalDeviceSurfacePresentModesKHR( 
#define VK_KHR_swapchain 1

VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkSwapchainKHR)



#define VK_KHR_SWAPCHAIN_REVISION         64

#define VK_KHR_SWAPCHAIN_REVISION         65

#define VK_KHR_SWAPCHAIN_EXTENSION_NUMBER 2

#define VK_KHR_SWAPCHAIN_EXTENSION_NAME   "VK_KHR_swapchain"

#define VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR ((VkStructureType)(int)0xc0000800)
@@ -3222,6 +3223,7 @@ typedef struct VkPresentInfoKHR { 
    uint32_t                                    swapchainCount;

    const VkSwapchainKHR*                       pSwapchains;

    const uint32_t*                             imageIndices;

    VkResult*                                   pResults;

} VkPresentInfoKHR;

vulkan/libvulkan/entry.cpp

+2 −2
Original line number Diff line number Diff line
@@ -92,8 +92,8 @@ void vkGetPhysicalDeviceFormatProperties(VkPhysicalDevice physicalDevice, VkForm 
}



__attribute__((visibility("default")))

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

    GetVtbl(physicalDevice).GetPhysicalDeviceImageFormatProperties(physicalDevice, format, type, tiling, usage, flags, pImageFormatProperties);

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

    return GetVtbl(physicalDevice).GetPhysicalDeviceImageFormatProperties(physicalDevice, format, type, tiling, usage, flags, pImageFormatProperties);

}



__attribute__((visibility("default")))

vulkan/libvulkan/loader.cpp

+4 −3
Original line number Diff line number Diff line
@@ -702,7 +702,7 @@ void GetPhysicalDeviceFormatPropertiesBottom(VkPhysicalDevice pdev, 
        pdev, format, properties);

}



void GetPhysicalDeviceImageFormatPropertiesBottom(

VkResult GetPhysicalDeviceImageFormatPropertiesBottom(

    VkPhysicalDevice pdev,

    VkFormat format,

    VkImageType type,
@@ -710,7 +710,8 @@ void GetPhysicalDeviceImageFormatPropertiesBottom( 
    VkImageUsageFlags usage,

    VkImageCreateFlags flags,

    VkImageFormatProperties* properties) {

    GetVtbl(pdev)->instance->drv.vtbl.GetPhysicalDeviceImageFormatProperties(

    return GetVtbl(pdev)

        ->instance->drv.vtbl.GetPhysicalDeviceImageFormatProperties(

            pdev, format, type, tiling, usage, flags, properties);

}

vulkan/libvulkan/swapchain.cpp

+7 −0
Original line number Diff line number Diff line
@@ -631,6 +631,8 @@ VkResult QueuePresentKHR(VkQueue queue, VkPresentInfoKHR* present_info) { 
        }

        if (result != VK_SUCCESS) {

            ALOGE("QueueSignalReleaseImageANDROID failed: %d", result);

            if (present_info->pResults)

                present_info->pResults[sc] = result;

            if (final_result == VK_SUCCESS)

                final_result = result;

            // TODO(jessehall): What happens to the buffer here? Does the app
@@ -645,6 +647,8 @@ VkResult QueuePresentKHR(VkQueue queue, VkPresentInfoKHR* present_info) { 
            // TODO(jessehall): What now? We should probably cancel the buffer,

            // I guess?

            ALOGE("queueBuffer failed: %s (%d)", strerror(-err), err);

            if (present_info->pResults)

                present_info->pResults[sc] = result;

            if (final_result == VK_SUCCESS)

                final_result = VK_ERROR_INITIALIZATION_FAILED;

            continue;
@@ -655,6 +659,9 @@ VkResult QueuePresentKHR(VkQueue queue, VkPresentInfoKHR* present_info) { 
            img.dequeue_fence = -1;

        }

        img.dequeued = false;



        if (present_info->pResults)

            present_info->pResults[sc] = VK_SUCCESS;

    }



    return final_result;