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

Commit 563380d3 authored by Jesse Hall's avatar Jesse Hall
Browse files

vulkan: Update to version 1.0.1 

Change-Id: Ib5d538bbcdf61f96bcfc0270b0e461927dd0b15b
(cherry picked from commit bfdbddcaf74d05966cde0f260a3d7da5a5b2d591)
parent 4da3bd68

vulkan/api/templates/vulkan_h.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ define VK_SUBPASS_EXTERNAL (~0U) 
    {{end}}

  {{end}}



#ifdef VK_PROTOTYPES

#ifdef VK_NO_PROTOTYPES



  {{range $f := AllCommands $}}

    {{if not (GetAnnotation $f "pfn")}}

vulkan/api/vulkan.api

+4 −4
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ import platform "platform.api" 
// API version (major.minor.patch)

define VERSION_MAJOR 1

define VERSION_MINOR 0

define VERSION_PATCH 0

define VERSION_PATCH 1



// API limits

define VK_MAX_PHYSICAL_DEVICE_NAME_SIZE 256
@@ -684,15 +684,15 @@ enum VkResult { 
    //@extension("VK_KHR_surface")

    VK_ERROR_SURFACE_LOST_KHR                               = 0xC4653600, // -1000000000



    //@extension("VK_KHR_surface")

    VK_ERROR_NATIVE_WINDOW_IN_USE_KHR                       = 0xC46535FF, // -1000008001



    //@extension("VK_KHR_swapchain")

    VK_ERROR_OUT_OF_DATE_KHR                                = 0xC4653214, // -1000001004



    //@extension("VK_KHR_display_swapchain")

    VK_ERROR_INCOMPATIBLE_DISPLAY_KHR                       = 0xC4652A47, // -1000003001



    //@extension("VK_KHR_android_surface")

    VK_ERROR_NATIVE_WINDOW_IN_USE_KHR                       = 0xC46516C0, // -1000008000



    //@extension("VK_EXT_debug_report")

    VK_ERROR_VALIDATION_FAILED_EXT                          = 0xC4650B07, // -1000011001

}

vulkan/include/vulkan/vk_android_native_buffer.h

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ typedef VkResult (VKAPI_PTR *PFN_vkGetSwapchainGrallocUsageANDROID)(VkDevice dev 
typedef VkResult (VKAPI_PTR *PFN_vkAcquireImageANDROID)(VkDevice device, VkImage image, int nativeFenceFd, VkSemaphore semaphore, VkFence fence);

typedef VkResult (VKAPI_PTR *PFN_vkQueueSignalReleaseImageANDROID)(VkQueue queue, uint32_t waitSemaphoreCount, const VkSemaphore* pWaitSemaphores, VkImage image, int* pNativeFenceFd);



#ifdef VK_PROTOTYPES

#ifndef VK_NO_PROTOTYPES

VKAPI_ATTR VkResult VKAPI_CALL vkGetSwapchainGrallocUsageANDROID(

    VkDevice            device,

    VkFormat            format,

vulkan/include/vulkan/vulkan.h

+856 −856
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(1, 0, 0)

#define VK_API_VERSION VK_MAKE_VERSION(1, 0, 1)





#define VK_NULL_HANDLE 0
@@ -134,10 +134,10 @@ typedef enum VkResult { 
    VK_ERROR_TOO_MANY_OBJECTS = -10,

    VK_ERROR_FORMAT_NOT_SUPPORTED = -11,

    VK_ERROR_SURFACE_LOST_KHR = -1000000000,

    VK_ERROR_NATIVE_WINDOW_IN_USE_KHR = -1000000001,

    VK_SUBOPTIMAL_KHR = 1000001003,

    VK_ERROR_OUT_OF_DATE_KHR = -1000001004,

    VK_ERROR_INCOMPATIBLE_DISPLAY_KHR = -1000003001,

    VK_ERROR_NATIVE_WINDOW_IN_USE_KHR = -1000008000,

    VK_ERROR_VALIDATION_FAILED_EXT = -1000011001,

    VK_RESULT_BEGIN_RANGE = VK_ERROR_FORMAT_NOT_SUPPORTED,

    VK_RESULT_END_RANGE = VK_INCOMPLETE,
@@ -2328,7 +2328,7 @@ typedef void (VKAPI_PTR *PFN_vkCmdNextSubpass)(VkCommandBuffer commandBuffer, Vk 
typedef void (VKAPI_PTR *PFN_vkCmdEndRenderPass)(VkCommandBuffer commandBuffer);

typedef void (VKAPI_PTR *PFN_vkCmdExecuteCommands)(VkCommandBuffer commandBuffer, uint32_t commandBufferCount, const VkCommandBuffer* pCommandBuffers);



#ifdef VK_PROTOTYPES

#ifndef VK_NO_PROTOTYPES

VKAPI_ATTR VkResult VKAPI_CALL vkCreateInstance(

    const VkInstanceCreateInfo*                 pCreateInfo,

    const VkAllocationCallbacks*                pAllocator,
@@ -3200,7 +3200,7 @@ typedef VkResult (VKAPI_PTR *PFN_vkGetPhysicalDeviceSurfaceCapabilitiesKHR)(VkPh 
typedef VkResult (VKAPI_PTR *PFN_vkGetPhysicalDeviceSurfaceFormatsKHR)(VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, uint32_t* pSurfaceFormatCount, VkSurfaceFormatKHR* pSurfaceFormats);

typedef VkResult (VKAPI_PTR *PFN_vkGetPhysicalDeviceSurfacePresentModesKHR)(VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, uint32_t* pPresentModeCount, VkPresentModeKHR* pPresentModes);



#ifdef VK_PROTOTYPES

#ifndef VK_NO_PROTOTYPES

VKAPI_ATTR void VKAPI_CALL vkDestroySurfaceKHR(

    VkInstance                                  instance,

    VkSurfaceKHR                                surface,
@@ -3277,7 +3277,7 @@ typedef VkResult (VKAPI_PTR *PFN_vkGetSwapchainImagesKHR)(VkDevice device, VkSwa 
typedef VkResult (VKAPI_PTR *PFN_vkAcquireNextImageKHR)(VkDevice device, VkSwapchainKHR swapchain, uint64_t timeout, VkSemaphore semaphore, VkFence fence, uint32_t* pImageIndex);

typedef VkResult (VKAPI_PTR *PFN_vkQueuePresentKHR)(VkQueue queue, const VkPresentInfoKHR* pPresentInfo);



#ifdef VK_PROTOTYPES

#ifndef VK_NO_PROTOTYPES

VKAPI_ATTR VkResult VKAPI_CALL vkCreateSwapchainKHR(

    VkDevice                                    device,

    const VkSwapchainCreateInfoKHR*             pCreateInfo,
@@ -3392,7 +3392,7 @@ typedef VkResult (VKAPI_PTR *PFN_vkCreateDisplayModeKHR)(VkPhysicalDevice physic 
typedef VkResult (VKAPI_PTR *PFN_vkGetDisplayPlaneCapabilitiesKHR)(VkPhysicalDevice physicalDevice, VkDisplayModeKHR mode, uint32_t planeIndex, VkDisplayPlaneCapabilitiesKHR* pCapabilities);

typedef VkResult (VKAPI_PTR *PFN_vkCreateDisplayPlaneSurfaceKHR)(VkInstance instance, const VkDisplaySurfaceCreateInfoKHR* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface);



#ifdef VK_PROTOTYPES

#ifndef VK_NO_PROTOTYPES

VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceDisplayPropertiesKHR(

    VkPhysicalDevice                            physicalDevice,

    uint32_t*                                   pPropertyCount,
@@ -3450,7 +3450,7 @@ typedef struct VkDisplayPresentInfoKHR { 


typedef VkResult (VKAPI_PTR *PFN_vkCreateSharedSwapchainsKHR)(VkDevice device, uint32_t swapchainCount, const VkSwapchainCreateInfoKHR* pCreateInfos, const VkAllocationCallbacks* pAllocator, VkSwapchainKHR* pSwapchains);



#ifdef VK_PROTOTYPES

#ifndef VK_NO_PROTOTYPES

VKAPI_ATTR VkResult VKAPI_CALL vkCreateSharedSwapchainsKHR(

    VkDevice                                    device,

    uint32_t                                    swapchainCount,
@@ -3480,7 +3480,7 @@ typedef struct VkXlibSurfaceCreateInfoKHR { 
typedef VkResult (VKAPI_PTR *PFN_vkCreateXlibSurfaceKHR)(VkInstance instance, const VkXlibSurfaceCreateInfoKHR* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface);

typedef VkBool32 (VKAPI_PTR *PFN_vkGetPhysicalDeviceXlibPresentationSupportKHR)(VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex, Display* dpy, VisualID visualID);



#ifdef VK_PROTOTYPES

#ifndef VK_NO_PROTOTYPES

VKAPI_ATTR VkResult VKAPI_CALL vkCreateXlibSurfaceKHR(

    VkInstance                                  instance,

    const VkXlibSurfaceCreateInfoKHR*           pCreateInfo,
@@ -3516,7 +3516,7 @@ typedef struct VkXcbSurfaceCreateInfoKHR { 
typedef VkResult (VKAPI_PTR *PFN_vkCreateXcbSurfaceKHR)(VkInstance instance, const VkXcbSurfaceCreateInfoKHR* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface);

typedef VkBool32 (VKAPI_PTR *PFN_vkGetPhysicalDeviceXcbPresentationSupportKHR)(VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex, xcb_connection_t* connection, xcb_visualid_t visual_id);



#ifdef VK_PROTOTYPES

#ifndef VK_NO_PROTOTYPES

VKAPI_ATTR VkResult VKAPI_CALL vkCreateXcbSurfaceKHR(

    VkInstance                                  instance,

    const VkXcbSurfaceCreateInfoKHR*            pCreateInfo,
@@ -3552,7 +3552,7 @@ typedef struct VkWaylandSurfaceCreateInfoKHR { 
typedef VkResult (VKAPI_PTR *PFN_vkCreateWaylandSurfaceKHR)(VkInstance instance, const VkWaylandSurfaceCreateInfoKHR* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface);

typedef VkBool32 (VKAPI_PTR *PFN_vkGetPhysicalDeviceWaylandPresentationSupportKHR)(VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex, struct wl_display* display);



#ifdef VK_PROTOTYPES

#ifndef VK_NO_PROTOTYPES

VKAPI_ATTR VkResult VKAPI_CALL vkCreateWaylandSurfaceKHR(

    VkInstance                                  instance,

    const VkWaylandSurfaceCreateInfoKHR*        pCreateInfo,
@@ -3587,7 +3587,7 @@ typedef struct VkMirSurfaceCreateInfoKHR { 
typedef VkResult (VKAPI_PTR *PFN_vkCreateMirSurfaceKHR)(VkInstance instance, const VkMirSurfaceCreateInfoKHR* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface);

typedef VkBool32 (VKAPI_PTR *PFN_vkGetPhysicalDeviceMirPresentationSupportKHR)(VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex, MirConnection* connection);



#ifdef VK_PROTOTYPES

#ifndef VK_NO_PROTOTYPES

VKAPI_ATTR VkResult VKAPI_CALL vkCreateMirSurfaceKHR(

    VkInstance                                  instance,

    const VkMirSurfaceCreateInfoKHR*            pCreateInfo,
@@ -3620,7 +3620,7 @@ typedef struct VkAndroidSurfaceCreateInfoKHR { 


typedef VkResult (VKAPI_PTR *PFN_vkCreateAndroidSurfaceKHR)(VkInstance instance, const VkAndroidSurfaceCreateInfoKHR* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface);



#ifdef VK_PROTOTYPES

#ifndef VK_NO_PROTOTYPES

VKAPI_ATTR VkResult VKAPI_CALL vkCreateAndroidSurfaceKHR(

    VkInstance                                  instance,

    const VkAndroidSurfaceCreateInfoKHR*        pCreateInfo,
@@ -3650,7 +3650,7 @@ typedef struct VkWin32SurfaceCreateInfoKHR { 
typedef VkResult (VKAPI_PTR *PFN_vkCreateWin32SurfaceKHR)(VkInstance instance, const VkWin32SurfaceCreateInfoKHR* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface);

typedef VkBool32 (VKAPI_PTR *PFN_vkGetPhysicalDeviceWin32PresentationSupportKHR)(VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex);



#ifdef VK_PROTOTYPES

#ifndef VK_NO_PROTOTYPES

VKAPI_ATTR VkResult VKAPI_CALL vkCreateWin32SurfaceKHR(

    VkInstance                                  instance,

    const VkWin32SurfaceCreateInfoKHR*          pCreateInfo,

vulkan/libvulkan/dispatch.tmpl

+0 −1
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ 
•* limitations under the License.

•*/



#define VK_PROTOTYPES

#define VK_USE_PLATFORM_ANDROID_KHR

#include <vulkan/vk_android_native_buffer.h>

#include <vulkan/vulkan.h>