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

Commit a8223377 authored by Jesse Hall's avatar Jesse Hall Committed by android-build-merger
Browse files

Merge changes I66c41101,Ibcb16e14,I9e9967ee 

am: e0fc37e9

Change-Id: Ic9392d801e25e89c8717197ae930406a51313d18
parents 16eae49b e0fc37e9

vulkan/api/platform.api

+3 −0
Original line number Diff line number Diff line
@@ -56,3 +56,6 @@ type u64 size_t 


// VK_USE_PLATFORM_XLIB_XRANDR_EXT

@internal type u64 RROutput



// VK_USE_PLATFORM_FUCHSIA

@internal type u32 zx_handle_t
 
 No newline at end of file

vulkan/api/vulkan.api

+296 −6

File changed.

Preview size limit exceeded, changes collapsed.

vulkan/include/vulkan/vulkan_core.h

+243 −5

File changed.

Preview size limit exceeded, changes collapsed.

vulkan/libvulkan/api_gen.cpp

+1 −0
Original line number Diff line number Diff line
@@ -556,6 +556,7 @@ VKAPI_ATTR PFN_vkVoidFunction GetDeviceProcAddr(VkDevice device, const char* pNa 
        "vkGetDisplayModeProperties2KHR",

        "vkGetDisplayPlaneCapabilities2KHR",

        "vkGetInstanceProcAddr",

        "vkGetPhysicalDeviceCalibrateableTimeDomainsEXT",

        "vkGetPhysicalDeviceDisplayPlaneProperties2KHR",

        "vkGetPhysicalDeviceDisplayProperties2KHR",

        "vkGetPhysicalDeviceExternalBufferProperties",

vulkan/libvulkan/code-generator.tmpl

+1 −0
Original line number Diff line number Diff line
@@ -1149,6 +1149,7 @@ VK_ANDROID_external_memory_android_hardware_buffer 
  {{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_FUCHSIA_imagepipe_surface"}}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