commit e6dc3d37f58c00c8818742cc27a69f793bea5672
author Yiwei Zhang <zzyiwei@google.com> Wed Nov 11 19:25:19 2020 +0000
committer Yiwei Zhang <zzyiwei@google.com> Thu Nov 12 18:20:51 2020 +0000
tree f692bc0f48a4764dc81c34e309969b221c7635c9
parent f29e2bf74252d19ea9b1fa77e40ac15a6b726994

Disable VK_KHR_external_memory_fd for Android build

Android relies on VK_ANDROID_external_memory_android_hardware_buffer.

Bug: b/158094132
Change-Id: I75498d38fc1d3e5c3a2b21df35fdef32d9f597a0
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/50248
Presubmit-Ready: Yiwei Zhang <zzyiwei@google.com>
Reviewed-by: David Turner <digit@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Reviewed-by: Chris Forbes <chrisforbes@google.com>
Kokoro-Result: kokoro <noreply+kokoro@google.com>
Tested-by: Yiwei Zhang <zzyiwei@google.com>

src/Vulkan/VkConfig.hpp

diff --git a/src/Vulkan/VkConfig.hpp b/src/Vulkan/VkConfig.hpp
index ecb2132..644c3de 100644
--- a/src/Vulkan/VkConfig.hpp
+++ b/src/Vulkan/VkConfig.hpp
@@ -86,9 +86,11 @@
 
 }  // namespace vk
 
-#if defined(__linux__) || defined(__ANDROID__)
+#if defined(__linux__) && !defined(__ANDROID__)
 #	define SWIFTSHADER_EXTERNAL_MEMORY_OPAQUE_FD 1
 #	define SWIFTSHADER_EXTERNAL_SEMAPHORE_OPAQUE_FD 1
+#elif defined(__ANDROID__)
+#	define SWIFTSHADER_EXTERNAL_SEMAPHORE_OPAQUE_FD 1
 #endif
 
 constexpr VkDeviceSize MAX_MEMORY_ALLOCATION_SIZE = 0x40000000ull;  // 0x40000000 = 1 GiB