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

Commit 1052e5fd authored by Jesse Hall's avatar Jesse Hall Committed by Android (Google) Code Review
Browse files

Merge changes I9adf2175,I9ba61b9b,Ic5791cf1,Ieaf1c4c0,I36370f6e, ... 

* changes:
  vulkan: Update from version 0.210.0 to 0.210.1
  vulkan: Assign enums to the correct extension
  vulkan: Update from version 0.209.0 to 0.210.0
  vulkan: Update from version 0.206.0 to 0.209.0
  vulkan: Update from version 0.205.0 to 0.206.0
  vulkan: Update from version 0.204.0 to 0.205.0
  vulkan: Update from version 0.203.0 to 0.204.0
  vulkan: Update from version 0.202.0 to 0.203.0
  vulkan: Update from version 0.200.0 to 0.202.0
  vulkan: Update from version 0.198.0 to 0.200.0
  vulkan: Update from version 0.197.0 to 0.198.0
  vulkan: Update from version 0.196.0 to 0.197.0
  vulkan: Update from version 0.194.0 to 0.196.0
  vulkan: Update from version 0.193.0 to 0.194.0
  vulkan: Update from version 0.192.0 to 0.193.0
  vulkan: Update from version 0.190.0 to 0.192.0
  vulkan: Update from version 0.189.0 to 0.190.0
  vulkan: Update from version 0.188.0 to 0.189.0
  vulkan: Update from version 0.186.0 to 0.188.0
  vulkan: Update from version 0.185.0 to 0.186.0
  vulkan: Update from version 0.184.0 to 0.185.0
  vulkan.api: Distinguish Vk*Flags from Vk*FlagBits
  vulkan: Update from version 0.183.0 to 0.184.0
  vulkan: Implement VkSurfaceKHR and use vulkanext.h
  vulkan: Update from version 0.181.0 to 0.183.0
  vulkan: Update from version 0.180.0 to 0.181.0
  vulkan: Update from version 0.179.0 to 0.180.0
  vulkan: Update from version 0.177.0 to 0.179.0
  vulkan: Update from version 0.174.0 to 0.177.0
  vulkan: Update from version 0.172.2 to 0.174.0
  vulkan: Add SDK 0.9 to 0.10 patch stack
parents a7aca157 bd888841

vulkan/api/platform.api

+25 −0
Original line number Diff line number Diff line
@@ -22,3 +22,28 @@ 
// Platform types, as defined or included in vk_platform.h



type u64 size_t



// VK_USE_PLATFORM_XLIB_KHR

@internal class Display {}

@internal class Window {}

@internal type u64 VisualID



// VK_USE_PLATFORM_XCB_KHR

@internal class xcb_connection_t {}

@internal type u32 xcb_window_t

@internal type u32 xcb_visualid_t



// VK_USE_PLATFORM_WAYLAND_KHR

@internal class wl_display {}

@internal class wl_surface {}



// VK_USE_PLATFORM_MIR_KHR

@internal class MirConnection {}

@internal class MirSurface {}



// VK_USE_PLATFORM_ANDROID_KHR

@internal class ANativeWindow {}



// VK_USE_PLATFORM_WIN32_KHR

@internal type void* HINSTANCE

@internal type void* HWND

vulkan/api/templates/vulkan_common.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ 
{{define "Vtbl#VkPhysicalDevice"}}Instance{{end}}

{{define "Vtbl#VkDevice"        }}Device{{end}}

{{define "Vtbl#VkQueue"         }}Device{{end}}

{{define "Vtbl#VkCmdBuffer"     }}Device{{end}}

{{define "Vtbl#VkCommandBuffer" }}Device{{end}}

{{define "Vtbl_Default"         }}Global{{end}}

{{define "Vtbl"}}

  {{AssertType $ "Function"}}

vulkan/api/templates/vulkan_h.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ extern "C" { 
#define VK_API_VERSION \

    VK_MAKE_VERSION({{Global "VERSION_MAJOR"}}, {{Global "VERSION_MINOR"}}, {{Global "VERSION_PATCH"}})



#if defined(__cplusplus) && (_MSC_VER >= 1800 || __cplusplus >= 201103L)

#if defined(__cplusplus) && ((defined(_MSC_VER) && _MSC_VER >= 1800 || __cplusplus >= 201103L)

    #define VK_NULL_HANDLE nullptr

#else

    #define VK_NULL_HANDLE 0

vulkan/api/vulkan.api

+2048 −1571

File changed.

Preview size limit exceeded, changes collapsed.

vulkan/include/vulkan/vk_ext_android_native_buffer.h→vulkan/include/vulkan/vk_android_native_buffer.h

+18 −18
Original line number Diff line number Diff line
@@ -14,16 +14,16 @@ 
 * limitations under the License.

 */



#ifndef __VK_EXT_ANDROID_NATIVE_BUFFER_H__

#define __VK_EXT_ANDROID_NATIVE_BUFFER_H__

#ifndef __VK_ANDROID_NATIVE_BUFFER_H__

#define __VK_ANDROID_NATIVE_BUFFER_H__



#include <vulkan/vulkan.h>

#include <system/window.h>



// TODO(jessehall): Get a real extension number officially assigned.

#define VK_EXT_ANDROID_NATIVE_BUFFER_EXTENSION_NUMBER 1024

#define VK_EXT_ANDROID_NATIVE_BUFFER_REVISION         1

#define VK_EXT_ANDROID_NATIVE_BUFFER_EXTENSION_NAME   "VK_EXT_ANDROID_gralloc"

#define VK_ANDROID_NATIVE_BUFFER_EXTENSION_NUMBER 1024

#define VK_ANDROID_NATIVE_BUFFER_REVISION         1

#define VK_ANDROID_NATIVE_BUFFER_EXTENSION_NAME   "VK_ANDROID_native_buffer"



#ifdef __cplusplus

extern "C" {
@@ -31,8 +31,8 @@ extern "C" { 


// See https://gitlab.khronos.org/vulkan/vulkan/blob/master/doc/proposals/proposed/NVIDIA/VulkanRegistryProposal.txt

// and Khronos bug 14154 for explanation of these magic numbers.

#define VK_EXT_ANDROID_NATIVE_BUFFER_ENUM(type,id)    ((type)((int)0xc0000000 - VK_EXT_ANDROID_NATIVE_BUFFER_EXTENSION_NUMBER * -1024 + (id)))

#define VK_STRUCTURE_TYPE_NATIVE_BUFFER_ANDROID       VK_EXT_ANDROID_NATIVE_BUFFER_ENUM(VkStructureType, 0)

#define VK_ANDROID_NATIVE_BUFFER_ENUM(type,id)    ((type)((int)0xc0000000 - VK_ANDROID_NATIVE_BUFFER_EXTENSION_NUMBER * -1024 + (id)))

#define VK_STRUCTURE_TYPE_NATIVE_BUFFER_ANDROID   VK_ANDROID_NATIVE_BUFFER_ENUM(VkStructureType, 0)



typedef struct {

    VkStructureType             sType; // must be VK_STRUCTURE_TYPE_NATIVE_BUFFER_ANDROID
@@ -47,39 +47,39 @@ typedef struct { 
    int                         usage;

} VkNativeBufferANDROID;



typedef VkResult (VKAPI *PFN_vkGetSwapchainGrallocUsageANDROID)(VkDevice device, VkFormat format, VkImageUsageFlags imageUsage, int* grallocUsage);

typedef VkResult (VKAPI *PFN_vkAcquireImageANDROID)(VkDevice device, VkImage image, int nativeFenceFd, VkSemaphore semaphore);

typedef VkResult (VKAPI *PFN_vkQueueSignalReleaseImageANDROID)(VkQueue queue, VkImage image, int* pNativeFenceFd);

typedef VkResult (VKAPI_PTR *PFN_vkGetSwapchainGrallocUsageANDROID)(VkDevice device, VkFormat format, VkImageUsageFlags imageUsage, int* grallocUsage);

typedef VkResult (VKAPI_PTR *PFN_vkAcquireImageANDROID)(VkDevice device, VkImage image, int nativeFenceFd, VkSemaphore semaphore);

typedef VkResult (VKAPI_PTR *PFN_vkQueueSignalReleaseImageANDROID)(VkQueue queue, VkImage image, int* pNativeFenceFd);

// -- DEPRECATED --

typedef VkResult (VKAPI *PFN_vkImportNativeFenceANDROID)(VkDevice device, VkSemaphore semaphore, int nativeFenceFd);

typedef VkResult (VKAPI *PFN_vkQueueSignalNativeFenceANDROID)(VkQueue queue, int* pNativeFenceFd);

typedef VkResult (VKAPI_PTR *PFN_vkImportNativeFenceANDROID)(VkDevice device, VkSemaphore semaphore, int nativeFenceFd);

typedef VkResult (VKAPI_PTR *PFN_vkQueueSignalNativeFenceANDROID)(VkQueue queue, int* pNativeFenceFd);

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



#ifdef VK_PROTOTYPES

VkResult VKAPI vkGetSwapchainGrallocUsageANDROID(

VKAPI_ATTR VkResult VKAPI_CALL vkGetSwapchainGrallocUsageANDROID(

    VkDevice            device,

    VkFormat            format,

    VkImageUsageFlags   imageUsage,

    int*                grallocUsage

);

VkResult VKAPI vkAcquireImageANDROID(

VKAPI_ATTR VkResult VKAPI_CALL vkAcquireImageANDROID(

    VkDevice            device,

    VkImage             image,

    int                 nativeFenceFd,

    VkSemaphore         semaphore

);

VkResult VKAPI vkQueueSignalReleaseImageANDROID(

VKAPI_ATTR VkResult VKAPI_CALL vkQueueSignalReleaseImageANDROID(

    VkQueue             queue,

    VkImage             image,

    int*                pNativeFenceFd

);

// -- DEPRECATED --

VkResult VKAPI vkImportNativeFenceANDROID(

VKAPI_ATTR VkResult VKAPI_CALL vkImportNativeFenceANDROID(

    VkDevice            device,

    VkSemaphore         semaphore,

    int                 nativeFenceFd

);

VkResult VKAPI vkQueueSignalNativeFenceANDROID(

VKAPI_ATTR VkResult VKAPI_CALL vkQueueSignalNativeFenceANDROID(

    VkQueue             queue,

    int*                pNativeFenceFd

);
@@ -90,4 +90,4 @@ VkResult VKAPI vkQueueSignalNativeFenceANDROID( 
}

#endif



#endif // __VK_EXT_ANDROID_NATIVE_BUFFER_H__
 
#endif // __VK_ANDROID_NATIVE_BUFFER_H__