| commit | 7a139de01ff5d07138c31fa75906cc281dbbb83c | [log] [tgz] |
|---|---|---|
| author | Gurchetan Singh <gurchetansingh@google.com> | Tue May 09 21:20:04 2023 +0000 |
| committer | Copybara-Service <copybara-worker@google.com> | Tue Mar 05 20:44:06 2024 -0800 |
| tree | e37722975852f6a525ab3f1d8868609d5eb0ca9d | |
| parent | 13da7dca74e80a31b017029d1683b6d76e6113f1 [diff] |
Merge "Revert "vulkan-cereal: improved MacOS support"" am: 47bb177886 am: ea9c478635 am: 716f13546d am: a37f5e2fc9 am: ed0ab6a599 am: c0954cc8f9 Original change: https://android-review.googlesource.com/c/device/generic/vulkan-cereal/+/2584730 Change-Id: I898512f8d7ba4ac7271cd3318bee99461be348a2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> GitOrigin-RevId: 086fef38b275677157ff6acf35356d0ae45d6e49
diff --git a/CMakeLists.txt b/CMakeLists.txt index 0a8cc12..9d085e8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt
@@ -150,7 +150,7 @@ # Fake Android guest#########################3################################## -if (NOT WIN32 AND NOT APPLE) +if (NOT WIN32) add_subdirectory(fake-android-guest) endif()
diff --git a/stream-servers/vulkan/SwapChainStateVk.cpp b/stream-servers/vulkan/SwapChainStateVk.cpp index 817e87d..1090f25 100644 --- a/stream-servers/vulkan/SwapChainStateVk.cpp +++ b/stream-servers/vulkan/SwapChainStateVk.cpp
@@ -140,7 +140,6 @@ #endif #ifdef __APPLE__ VK_EXT_METAL_SURFACE_EXTENSION_NAME, - VK_MVK_MOLTENVK_EXTENSION_NAME, #endif #ifdef VK_USE_PLATFORM_XCB_KHR VK_KHR_XCB_SURFACE_EXTENSION_NAME,