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

Commit 889cd9aa authored by Jesse Hall's avatar Jesse Hall
Browse files

resolve merge conflicts of 641f2cf4 to master 

Test: [sailfish] make ; mmm frameworks/native/vulkan
Change-Id: I8555fdfbe6375e6266d07b66b5a8085d37e1ffde
parents 2a7c23a6 641f2cf4

vulkan/api/platform.api

+1 −0
Original line number Diff line number Diff line
@@ -49,4 +49,5 @@ type u64 size_t 
@internal type void* HINSTANCE

@internal type void* HWND

@internal type void* HANDLE

@internal type u32   DWORD

@internal class SECURITY_ATTRIBUTES {}

vulkan/api/vulkan.api

+254 −276

File changed.

Preview size limit exceeded, changes collapsed.

vulkan/include/vulkan/vk_platform.h

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ extern "C" 
    #define VKAPI_PTR  VKAPI_CALL

#elif defined(__ANDROID__) && defined(__ARM_ARCH) && __ARM_ARCH < 7

    #error "Vulkan isn't supported for the 'armeabi' NDK ABI"

#elif defined(__ANDROID__) && __ARM_ARCH >= 7 && __ARM_32BIT_STATE

#elif defined(__ANDROID__) && defined(__ARM_ARCH) && __ARM_ARCH >= 7 && defined(__ARM_32BIT_STATE)

    // On Android 32-bit ARM targets, Vulkan functions use the "hardfloat"

    // calling convention, i.e. float parameters are passed in registers. This

    // is true even if the rest of the application passes floats on the stack,

vulkan/include/vulkan/vulkan.h

+46 −47
Original line number Diff line number Diff line
@@ -220,7 +220,6 @@ typedef enum VkStructureType { 
    VK_STRUCTURE_TYPE_DEDICATED_ALLOCATION_IMAGE_CREATE_INFO_NV = 1000026000,

    VK_STRUCTURE_TYPE_DEDICATED_ALLOCATION_BUFFER_CREATE_INFO_NV = 1000026001,

    VK_STRUCTURE_TYPE_DEDICATED_ALLOCATION_MEMORY_ALLOCATE_INFO_NV = 1000026002,

    VK_STRUCTURE_TYPE_PRESENT_REGIONS_KHR = 1000084000,

    VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_IMAGE_CREATE_INFO_NV = 1000056000,

    VK_STRUCTURE_TYPE_EXPORT_MEMORY_ALLOCATE_INFO_NV = 1000056001,

    VK_STRUCTURE_TYPE_IMPORT_MEMORY_WIN32_HANDLE_INFO_NV = 1000057000,
@@ -236,6 +235,7 @@ typedef enum VkStructureType { 
    VK_STRUCTURE_TYPE_SPARSE_IMAGE_FORMAT_PROPERTIES_2_KHR = 1000059007,

    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SPARSE_IMAGE_FORMAT_INFO_2_KHR = 1000059008,

    VK_STRUCTURE_TYPE_VALIDATION_FLAGS_EXT = 1000061000,

    VK_STRUCTURE_TYPE_PRESENT_REGIONS_KHR = 1000084000,

    VK_STRUCTURE_TYPE_OBJECT_TABLE_CREATE_INFO_NVX = 1000086000,

    VK_STRUCTURE_TYPE_INDIRECT_COMMANDS_LAYOUT_CREATE_INFO_NVX = 1000086001,

    VK_STRUCTURE_TYPE_CMD_PROCESS_COMMANDS_INFO_NVX = 1000086002,
@@ -4153,52 +4153,6 @@ typedef struct VkDedicatedAllocationMemoryAllocateInfoNV { 
} VkDedicatedAllocationMemoryAllocateInfoNV;





#define VK_GOOGLE_display_timing 1

#define VK_GOOGLE_DISPLAY_TIMING_SPEC_VERSION 1

#define VK_GOOGLE_DISPLAY_TIMING_EXTENSION_NAME "VK_GOOGLE_display_timing"



typedef struct VkRefreshCycleDurationGOOGLE {

    uint64_t    refreshDuration;

} VkRefreshCycleDurationGOOGLE;



typedef struct VkPastPresentationTimingGOOGLE {

    uint32_t    presentID;

    uint64_t    desiredPresentTime;

    uint64_t    actualPresentTime;

    uint64_t    earliestPresentTime;

    uint64_t    presentMargin;

} VkPastPresentationTimingGOOGLE;



typedef struct VkPresentTimeGOOGLE {

    uint32_t    presentID;

    uint64_t    desiredPresentTime;

} VkPresentTimeGOOGLE;



typedef struct VkPresentTimesInfoGOOGLE {

    VkStructureType               sType;

    const void*                   pNext;

    uint32_t                      swapchainCount;

    const VkPresentTimeGOOGLE*    pTimes;

} VkPresentTimesInfoGOOGLE;





typedef VkResult (VKAPI_PTR *PFN_vkGetRefreshCycleDurationGOOGLE)(VkDevice device, VkSwapchainKHR swapchain, VkRefreshCycleDurationGOOGLE* pDisplayTimingProperties);

typedef VkResult (VKAPI_PTR *PFN_vkGetPastPresentationTimingGOOGLE)(VkDevice device, VkSwapchainKHR swapchain, uint32_t* pPresentationTimingCount, VkPastPresentationTimingGOOGLE* pPresentationTimings);



#ifndef VK_NO_PROTOTYPES

VKAPI_ATTR VkResult VKAPI_CALL vkGetRefreshCycleDurationGOOGLE(

    VkDevice                                    device,

    VkSwapchainKHR                              swapchain,

    VkRefreshCycleDurationGOOGLE*               pDisplayTimingProperties);



VKAPI_ATTR VkResult VKAPI_CALL vkGetPastPresentationTimingGOOGLE(

    VkDevice                                    device,

    VkSwapchainKHR                              swapchain,

    uint32_t*                                   pPresentationTimingCount,

    VkPastPresentationTimingGOOGLE*             pPresentationTimings);

#endif





#define VK_AMD_draw_indirect_count 1

#define VK_AMD_DRAW_INDIRECT_COUNT_SPEC_VERSION 1

#define VK_AMD_DRAW_INDIRECT_COUNT_EXTENSION_NAME "VK_AMD_draw_indirect_count"
@@ -4607,6 +4561,51 @@ VKAPI_ATTR void VKAPI_CALL vkGetPhysicalDeviceGeneratedCommandsPropertiesNVX( 
    VkDeviceGeneratedCommandsLimitsNVX*         pLimits);

#endif



#define VK_GOOGLE_display_timing 1

#define VK_GOOGLE_DISPLAY_TIMING_SPEC_VERSION 1

#define VK_GOOGLE_DISPLAY_TIMING_EXTENSION_NAME "VK_GOOGLE_display_timing"



typedef struct VkRefreshCycleDurationGOOGLE {

    uint64_t    refreshDuration;

} VkRefreshCycleDurationGOOGLE;



typedef struct VkPastPresentationTimingGOOGLE {

    uint32_t    presentID;

    uint64_t    desiredPresentTime;

    uint64_t    actualPresentTime;

    uint64_t    earliestPresentTime;

    uint64_t    presentMargin;

} VkPastPresentationTimingGOOGLE;



typedef struct VkPresentTimeGOOGLE {

    uint32_t    presentID;

    uint64_t    desiredPresentTime;

} VkPresentTimeGOOGLE;



typedef struct VkPresentTimesInfoGOOGLE {

    VkStructureType               sType;

    const void*                   pNext;

    uint32_t                      swapchainCount;

    const VkPresentTimeGOOGLE*    pTimes;

} VkPresentTimesInfoGOOGLE;





typedef VkResult (VKAPI_PTR *PFN_vkGetRefreshCycleDurationGOOGLE)(VkDevice device, VkSwapchainKHR swapchain, VkRefreshCycleDurationGOOGLE* pDisplayTimingProperties);

typedef VkResult (VKAPI_PTR *PFN_vkGetPastPresentationTimingGOOGLE)(VkDevice device, VkSwapchainKHR swapchain, uint32_t* pPresentationTimingCount, VkPastPresentationTimingGOOGLE* pPresentationTimings);



#ifndef VK_NO_PROTOTYPES

VKAPI_ATTR VkResult VKAPI_CALL vkGetRefreshCycleDurationGOOGLE(

    VkDevice                                    device,

    VkSwapchainKHR                              swapchain,

    VkRefreshCycleDurationGOOGLE*               pDisplayTimingProperties);



VKAPI_ATTR VkResult VKAPI_CALL vkGetPastPresentationTimingGOOGLE(

    VkDevice                                    device,

    VkSwapchainKHR                              swapchain,

    uint32_t*                                   pPresentationTimingCount,

    VkPastPresentationTimingGOOGLE*             pPresentationTimings);

#endif



#define VK_EXT_hdr_metadata 1

#define VK_EXT_HDR_METADATA_SPEC_VERSION  0

#define VK_EXT_HDR_METADATA_EXTENSION_NAME "VK_EXT_hdr_metadata"

vulkan/libvulkan/code-generator.tmpl

+2 −0
Original line number Diff line number Diff line
@@ -1122,6 +1122,8 @@ VK_KHR_shared_presentable_image 
  {{else if eq $ext "VK_KHR_wayland_surface"}}true

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

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

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

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

  {{end}}

{{end}}