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

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

vulkan: update Vulkan headers to 1.0.42 

Test: mmm frameworks/native/vulkan
Merged-In: I9c41b483fbf48a7404b54bfe405c40b58422ea74
Change-Id: I8ea5dfb9ad79fee64032e9d90b21ee087e4e5baa
parent 9943197b

vulkan/api/platform.api

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ type u64 size_t 
@internal type void* HWND

@internal type void* HANDLE

@internal type u32   DWORD

@internal type u16*  LPCWSTR

@internal class SECURITY_ATTRIBUTES {}



// VK_USE_PLATFORM_XLIB_XRANDR_EXT

vulkan/api/vulkan.api

+1308 −235

File changed.

Preview size limit exceeded, changes collapsed.

vulkan/include/vulkan/vulkan.h

+991 −5

File changed.

Preview size limit exceeded, changes collapsed.

vulkan/libvulkan/api_gen.cpp

+11 −5
Original line number Diff line number Diff line
@@ -389,7 +389,7 @@ VKAPI_ATTR void CmdDraw(VkCommandBuffer commandBuffer, uint32_t vertexCount, uin 
VKAPI_ATTR void CmdDrawIndexed(VkCommandBuffer commandBuffer, uint32_t indexCount, uint32_t instanceCount, uint32_t firstIndex, int32_t vertexOffset, uint32_t firstInstance);

VKAPI_ATTR void CmdDrawIndirect(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, uint32_t drawCount, uint32_t stride);

VKAPI_ATTR void CmdDrawIndexedIndirect(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, uint32_t drawCount, uint32_t stride);

VKAPI_ATTR void CmdDispatch(VkCommandBuffer commandBuffer, uint32_t x, uint32_t y, uint32_t z);

VKAPI_ATTR void CmdDispatch(VkCommandBuffer commandBuffer, uint32_t groupCountX, uint32_t groupCountY, uint32_t groupCountZ);

VKAPI_ATTR void CmdDispatchIndirect(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset);

VKAPI_ATTR void CmdCopyBuffer(VkCommandBuffer commandBuffer, VkBuffer srcBuffer, VkBuffer dstBuffer, uint32_t regionCount, const VkBufferCopy* pRegions);

VKAPI_ATTR void CmdCopyImage(VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage dstImage, VkImageLayout dstImageLayout, uint32_t regionCount, const VkImageCopy* pRegions);
@@ -451,9 +451,12 @@ VKAPI_ATTR PFN_vkVoidFunction GetDeviceProcAddr(VkDevice device, const char* pNa 
        "vkEnumerateDeviceLayerProperties",

        "vkEnumerateInstanceExtensionProperties",

        "vkEnumerateInstanceLayerProperties",

        "vkEnumeratePhysicalDeviceGroupsKHX",

        "vkEnumeratePhysicalDevices",

        "vkGetInstanceProcAddr",

        "vkGetPhysicalDeviceExternalBufferPropertiesKHX",

        "vkGetPhysicalDeviceExternalImageFormatPropertiesNV",

        "vkGetPhysicalDeviceExternalSemaphorePropertiesKHX",

        "vkGetPhysicalDeviceFeatures",

        "vkGetPhysicalDeviceFeatures2KHR",

        "vkGetPhysicalDeviceFormatProperties",
@@ -461,10 +464,13 @@ VKAPI_ATTR PFN_vkVoidFunction GetDeviceProcAddr(VkDevice device, const char* pNa 
        "vkGetPhysicalDeviceGeneratedCommandsPropertiesNVX",

        "vkGetPhysicalDeviceImageFormatProperties",

        "vkGetPhysicalDeviceImageFormatProperties2KHR",

        "vkGetPhysicalDeviceImageFormatProperties2KHX",

        "vkGetPhysicalDeviceMemoryProperties",

        "vkGetPhysicalDeviceMemoryProperties2KHR",

        "vkGetPhysicalDevicePresentRectanglesKHX",

        "vkGetPhysicalDeviceProperties",

        "vkGetPhysicalDeviceProperties2KHR",

        "vkGetPhysicalDeviceProperties2KHX",

        "vkGetPhysicalDeviceQueueFamilyProperties",

        "vkGetPhysicalDeviceQueueFamilyProperties2KHR",

        "vkGetPhysicalDeviceSparseImageFormatProperties",
@@ -1058,8 +1064,8 @@ VKAPI_ATTR void CmdDrawIndexedIndirect(VkCommandBuffer commandBuffer, VkBuffer b 
    GetData(commandBuffer).dispatch.CmdDrawIndexedIndirect(commandBuffer, buffer, offset, drawCount, stride);

}



VKAPI_ATTR void CmdDispatch(VkCommandBuffer commandBuffer, uint32_t x, uint32_t y, uint32_t z) {

    GetData(commandBuffer).dispatch.CmdDispatch(commandBuffer, x, y, z);

VKAPI_ATTR void CmdDispatch(VkCommandBuffer commandBuffer, uint32_t groupCountX, uint32_t groupCountY, uint32_t groupCountZ) {

    GetData(commandBuffer).dispatch.CmdDispatch(commandBuffer, groupCountX, groupCountY, groupCountZ);

}



VKAPI_ATTR void CmdDispatchIndirect(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset) {
@@ -1771,8 +1777,8 @@ VKAPI_ATTR void vkCmdDrawIndexedIndirect(VkCommandBuffer commandBuffer, VkBuffer 
}



__attribute__((visibility("default")))

VKAPI_ATTR void vkCmdDispatch(VkCommandBuffer commandBuffer, uint32_t x, uint32_t y, uint32_t z) {

    vulkan::api::CmdDispatch(commandBuffer, x, y, z);

VKAPI_ATTR void vkCmdDispatch(VkCommandBuffer commandBuffer, uint32_t groupCountX, uint32_t groupCountY, uint32_t groupCountZ) {

    vulkan::api::CmdDispatch(commandBuffer, groupCountX, groupCountY, groupCountZ);

}



__attribute__((visibility("default")))

vulkan/libvulkan/code-generator.tmpl

+5 −0
Original line number Diff line number Diff line
@@ -1114,10 +1114,15 @@ VK_KHR_swapchain 
  {{else if eq $ext "VK_KHR_xlib_surface"}}true

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

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

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

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

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

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

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

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

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

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

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

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

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

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