summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBo Hu <bohu@google.com>2021-11-16 17:51:39 +0000
committerBo Hu <bohu@google.com>2021-11-16 17:51:39 +0000
commitc52bb90e383e669f70b943df7916f76470849255 (patch)
tree24506b57ba71cb58c105cb1a95902d24cdd5bece
parentffb4af86d8154ac70a93b0fee709d0d345b76cad (diff)
downloadgfxstream-protocols-c52bb90e383e669f70b943df7916f76470849255.tar.gz
Revert "cmake: Remove architecture specifiers for some compiler ..."
Revert submission 1890497 Reason for revert: broke mac build Reverted Changes: I85d03d2a6:cmake: Remove architecture specifiers for some com... I931213a8a:macOS: Add macOS support to Vulkan unittests. I467ca422d:macOS: Remove Vulkan cereal marshaling / decoding ... Change-Id: I5633d7f5f558d9d536b4a9b249a2cf45cee675f5
-rw-r--r--registry/vulkan/xml/cerealgenerator.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/registry/vulkan/xml/cerealgenerator.py b/registry/vulkan/xml/cerealgenerator.py
index 555e0ec1..12f227b8 100644
--- a/registry/vulkan/xml/cerealgenerator.py
+++ b/registry/vulkan/xml/cerealgenerator.py
@@ -128,8 +128,10 @@ android_add_library(TARGET OpenglRender_vulkan_cereal_dispatch LICENSE Apache-2.
)
target_compile_definitions(OpenglRender_vulkan_cereal_dispatch PRIVATE -DVK_ANDROID_native_buffer -DVK_GOOGLE_gfxstream)
android_target_compile_definitions(OpenglRender_vulkan_cereal_dispatch windows PRIVATE -DVK_USE_PLATFORM_WIN32_KHR)
-android_target_compile_definitions(OpenglRender_vulkan_cereal_dispatch linux PRIVATE -DVK_USE_PLATFORM_XCB_KHR)
-android_target_compile_definitions(OpenglRender_vulkan_cereal_dispatch darwin PRIVATE -DVK_USE_PLATFORM_METAL_EXT)
+android_target_compile_definitions(OpenglRender_vulkan_cereal_dispatch linux-x86_64 PRIVATE -DVK_USE_PLATFORM_XCB_KHR)
+android_target_compile_definitions(OpenglRender_vulkan_cereal_dispatch linux-aarch64 PRIVATE -DVK_USE_PLATFORM_XCB_KHR)
+android_target_compile_definitions(OpenglRender_vulkan_cereal_dispatch darwin-x86_64 PRIVATE -DVK_USE_PLATFORM_METAL_EXT)
+android_target_compile_definitions(OpenglRender_vulkan_cereal_dispatch darwin-aarch64 PRIVATE -DVK_USE_PLATFORM_METAL_EXT)
target_include_directories(OpenglRender_vulkan_cereal_dispatch
PUBLIC
${ANDROID_EMUGL_DIR}/host/libs/libOpenglRender/vulkan/cereal