Commit 4963b953 by Chris Forbes

Various additional fixes for Android build

- VK_EXPORT was not defined, causing all kinds of trouble - Android WSI code was based on an earlier version which didnt require aspect mask to be passed to some functions - More missing files for ARM target Change-Id: Ia5f88c5692d48f2d7898c86c26347bed6e4b4f22 Repro: external/swiftshader$ mma Bug: b/129979580 Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/32188 Presubmit-Ready: Chris Forbes <chrisforbes@google.com> Tested-by: 's avatarChris Forbes <chrisforbes@google.com> Reviewed-by: 's avatarBen Clayton <bclayton@google.com> Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
parent 761ce8af
...@@ -30,6 +30,7 @@ cc_defaults { ...@@ -30,6 +30,7 @@ cc_defaults {
cppflags: [ cppflags: [
"-Woverloaded-virtual", "-Woverloaded-virtual",
"-DVK_USE_PLATFORM_ANDROID_KHR", "-DVK_USE_PLATFORM_ANDROID_KHR",
"-DVK_EXPORT= ",
], ],
cpp_std: "c++11", cpp_std: "c++11",
......
...@@ -2809,7 +2809,7 @@ VKAPI_ATTR VkResult VKAPI_CALL vkQueueSignalReleaseImageANDROID(VkQueue queue, u ...@@ -2809,7 +2809,7 @@ VKAPI_ATTR VkResult VKAPI_CALL vkQueueSignalReleaseImageANDROID(VkQueue queue, u
BackingMemory backmem = it->second; BackingMemory backmem = it->second;
VkExtent3D extent = vk::Cast(image)->getMipLevelExtent(0); VkExtent3D extent = vk::Cast(image)->getMipLevelExtent(VK_IMAGE_ASPECT_COLOR_BIT, 0);
grallocMod->lock(backmem.nativeHandle, GRALLOC_USAGE_SW_WRITE_OFTEN, 0, 0, extent.width, extent.height, &nativeBuffer); grallocMod->lock(backmem.nativeHandle, GRALLOC_USAGE_SW_WRITE_OFTEN, 0, 0, extent.width, extent.height, &nativeBuffer);
char* buffer = static_cast<char*>(vk::Cast(backmem.imageMemory)->getOffsetPointer(0)); char* buffer = static_cast<char*>(vk::Cast(backmem.imageMemory)->getOffsetPointer(0));
......
...@@ -41,6 +41,7 @@ cc_library_static { ...@@ -41,6 +41,7 @@ cc_library_static {
"llvm/lib/Analysis/LoopAnalysisManager.cpp", "llvm/lib/Analysis/LoopAnalysisManager.cpp",
"llvm/lib/Analysis/LoopInfo.cpp", "llvm/lib/Analysis/LoopInfo.cpp",
"llvm/lib/Analysis/LoopPass.cpp", "llvm/lib/Analysis/LoopPass.cpp",
"llvm/lib/Analysis/LoopAccessAnalysis.cpp",
"llvm/lib/Analysis/MemoryBuiltins.cpp", "llvm/lib/Analysis/MemoryBuiltins.cpp",
"llvm/lib/Analysis/MemoryDependenceAnalysis.cpp", "llvm/lib/Analysis/MemoryDependenceAnalysis.cpp",
"llvm/lib/Analysis/MemoryLocation.cpp", "llvm/lib/Analysis/MemoryLocation.cpp",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment