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

Commit 2a9a1c66 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes Ice6ec464,I02d4790f,I84cdb4c2

* changes:
  libvulkan: Add VK_ANDROID_external_memory_android_hardware_buffer
  vulkan: Declare VK_ANDROID_external_memory_android_hardware_buffer
  vulkan: update Vulkan headers to 1.1.68
parents a7b4ac2f a8d367a3
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ ndk_headers {
    srcs: [
        "include/vulkan/vk_platform.h",
        "include/vulkan/vulkan.h",
        "include/vulkan/vulkan_core.h",
        "include/vulkan/vulkan_android.h",
    ],
    license: "include/vulkan/NOTICE",
}
+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ type u64 size_t

// VK_USE_PLATFORM_ANDROID_KHR
@internal class ANativeWindow {}
@internal class AHardwareBuffer {}
@internal type void* buffer_handle_t

// VK_USE_PLATFORM_WIN32_KHR
+449 −7

File changed.

Preview size limit exceeded, changes collapsed.

+0 −28
Original line number Diff line number Diff line
@@ -89,32 +89,4 @@ extern "C"
} // extern "C"
#endif // __cplusplus

// Platform-specific headers required by platform window system extensions.
// These are enabled prior to #including "vulkan.h". The same enable then
// controls inclusion of the extension interfaces in vulkan.h.

#ifdef VK_USE_PLATFORM_ANDROID_KHR
struct ANativeWindow;
#endif

#ifdef VK_USE_PLATFORM_MIR_KHR
#include <mir_toolkit/client_types.h>
#endif

#ifdef VK_USE_PLATFORM_WAYLAND_KHR
#include <wayland-client.h>
#endif

#ifdef VK_USE_PLATFORM_WIN32_KHR
#include <windows.h>
#endif

#ifdef VK_USE_PLATFORM_XLIB_KHR
#include <X11/Xlib.h>
#endif

#ifdef VK_USE_PLATFORM_XCB_KHR
#include <xcb/xcb.h>
#endif

#endif
+39 −7357

File changed.

Preview size limit exceeded, changes collapsed.

Loading