Implement an Android NDK build of SwiftShader using the CMake files.
From the build directory, run:
cmake -DCMAKE_TOOLCHAIN_FILE=../build/android.toolchain.cmake ..
Everything compiles and links. unittests, vk-unittests and ReactorUnitTests are known to work.
A "rundroid.sh" script is provided to upload and run Android binaries.
This CL has contains the first draft of an NDK-based FrameBuffer implementation.
It stubs out the gralloc calls in Image (consequence: EGLImage likely won't work).
NOTE: a small CMake patch is necessary; hopefully we'll find a way around this or land it in
CMake:
diff cmake-3.10/Modules/Platform/Android/Determine-Compiler-NDK.cmake.bak cmake-3.10/Modules/Platform/Android/Determine-Compiler-NDK.cmake
231c231
< set(_ANDROID_TOOL_C_COMPILER_EXTERNAL_TOOLCHAIN ${CMAKE_ANDROID_NDK}/toolchains/${_ANDROID_TOOL_NAME}/prebuilt/${_ANDROID_HOST_DIR})
---
> set(_ANDROID_TOOL_C_COMPILER_EXTERNAL_TOOLCHAIN ${CMAKE_ANDROID_NDK}/toolchains/${_ANDROID_TOOL_LLVM_NAME}/prebuilt/${_ANDROID_HOST_DIR})
Bug: b/129942368
Change-Id: I107a2f719256b6477ad105054ca68c676c05ec5c
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/27869
Presubmit-Ready: Stephen White <senorblanco@chromium.org>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
Tested-by: Stephen White <senorblanco@chromium.org>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
diff --git a/src/OpenGL/libEGL/Config.cpp b/src/OpenGL/libEGL/Config.cpp
index 4c35f6b..1af9229 100644
--- a/src/OpenGL/libEGL/Config.cpp
+++ b/src/OpenGL/libEGL/Config.cpp
@@ -21,7 +21,7 @@
#include "common/debug.h"
#include <EGL/eglext.h>
-#ifdef __ANDROID__
+#if defined(__ANDROID__) && !defined(ANDROID_NDK_BUILD)
#include <system/graphics.h>
#endif
@@ -65,7 +65,7 @@
mBlueSize = 8;
mAlphaSize = 8;
mBindToTextureRGBA = EGL_TRUE;
- #ifdef __ANDROID__
+ #if defined(__ANDROID__) && !defined(ANDROID_NDK_BUILD)
mNativeVisualID = HAL_PIXEL_FORMAT_BGRA_8888;
#else
mNativeVisualID = 2; // Arbitrary; prefer over ABGR
@@ -77,7 +77,7 @@
mBlueSize = 8;
mAlphaSize = 8;
mBindToTextureRGBA = EGL_TRUE;
- #ifdef __ANDROID__
+ #if defined(__ANDROID__) && !defined(ANDROID_NDK_BUILD)
mNativeVisualID = HAL_PIXEL_FORMAT_RGBA_8888;
#endif
break;
@@ -86,7 +86,7 @@
mGreenSize = 6;
mBlueSize = 5;
mAlphaSize = 0;
- #ifdef __ANDROID__
+ #if defined(__ANDROID__) && !defined(ANDROID_NDK_BUILD)
mNativeVisualID = HAL_PIXEL_FORMAT_RGB_565;
#endif
break;
@@ -96,7 +96,7 @@
mBlueSize = 8;
mAlphaSize = 0;
mBindToTextureRGB = EGL_TRUE;
- #ifdef __ANDROID__
+ #if defined(__ANDROID__) && !defined(ANDROID_NDK_BUILD)
mNativeVisualID = 0x1FF; // HAL_PIXEL_FORMAT_BGRX_8888
#else
mNativeVisualID = 1; // Arbitrary; prefer over XBGR
@@ -108,7 +108,7 @@
mBlueSize = 8;
mAlphaSize = 0;
mBindToTextureRGB = EGL_TRUE;
- #ifdef __ANDROID__
+ #if defined(__ANDROID__) && !defined(ANDROID_NDK_BUILD)
mNativeVisualID = HAL_PIXEL_FORMAT_RGBX_8888;
#endif
break;
diff --git a/src/OpenGL/libEGL/Display.cpp b/src/OpenGL/libEGL/Display.cpp
index ac525f0..99503ea 100644
--- a/src/OpenGL/libEGL/Display.cpp
+++ b/src/OpenGL/libEGL/Display.cpp
@@ -25,7 +25,7 @@
#include "common/debug.h"
#include "Common/RecursiveLock.hpp"
-#ifdef __ANDROID__
+#if defined(__ANDROID__) && !defined(ANDROID_NDK_BUILD)
#include <system/window.h>
#include <sys/ioctl.h>
#include <linux/fb.h>
@@ -671,11 +671,13 @@
ERR("%s called with window==NULL %s:%d", __FUNCTION__, __FILE__, __LINE__);
return false;
}
+ #if !defined(ANDROID_NDK_BUILD)
if(static_cast<ANativeWindow*>(window)->common.magic != ANDROID_NATIVE_WINDOW_MAGIC)
{
ERR("%s called with window==%p bad magic %s:%d", __FUNCTION__, window, __FILE__, __LINE__);
return false;
}
+ #endif // !defined(ANDROID_NDK_BUILD)
return true;
#elif defined(USE_X11)
if(nativeDisplay)
@@ -782,6 +784,7 @@
default: UNREACHABLE(bpp); // Unexpected display mode color depth
}
#elif defined(__ANDROID__)
+ #if !defined(ANDROID_NDK_BUILD)
static const char *const framebuffer[] =
{
"/dev/graphics/fb0",
@@ -841,6 +844,7 @@
}
}
}
+ #endif // !defined_ANDROID_NDK_BUILD)
// No framebuffer device found, or we're in user space
return sw::FORMAT_X8B8G8R8;
diff --git a/src/OpenGL/libEGL/Surface.cpp b/src/OpenGL/libEGL/Surface.cpp
index b8bba5f..dd912ed 100644
--- a/src/OpenGL/libEGL/Surface.cpp
+++ b/src/OpenGL/libEGL/Surface.cpp
@@ -33,6 +33,9 @@
#elif defined(__APPLE__)
#include "OSXUtils.hpp"
#endif
+#if defined(__ANDROID__) && defined(ANDROID_NDK_BUILD)
+#include <android/native_window.h>
+#endif
#include <algorithm>
@@ -339,8 +342,13 @@
int windowWidth = client.right - client.left;
int windowHeight = client.bottom - client.top;
#elif defined(__ANDROID__)
+ #ifdef ANDROID_NDK_BUILD
+ int windowWidth = ANativeWindow_getWidth(window);
+ int windowHeight = ANativeWindow_getHeight(window);
+ #else
int windowWidth; window->query(window, NATIVE_WINDOW_WIDTH, &windowWidth);
int windowHeight; window->query(window, NATIVE_WINDOW_HEIGHT, &windowHeight);
+ #endif
#elif defined(USE_X11)
XWindowAttributes windowAttributes;
Status status = libX11->XGetWindowAttributes((::Display*)display->getNativeDisplay(), window, &windowAttributes);
diff --git a/src/OpenGL/libEGL/libEGL.cpp b/src/OpenGL/libEGL/libEGL.cpp
index 912fe0c..51f5309 100644
--- a/src/OpenGL/libEGL/libEGL.cpp
+++ b/src/OpenGL/libEGL/libEGL.cpp
@@ -23,7 +23,7 @@
#include "common/debug.h"
#include "Common/Version.h"
-#if defined(__ANDROID__)
+#if defined(__ANDROID__) && !defined(ANDROID_NDK_BUILD)
#include <system/window.h>
#elif defined(USE_X11)
#include "Main/libX11.hpp"
@@ -1170,7 +1170,7 @@
}
}
- #if defined(__ANDROID__)
+ #if defined(__ANDROID__) && !defined(ANDROID_NDK_BUILD)
if(target == EGL_NATIVE_BUFFER_ANDROID)
{
ANativeWindowBuffer *nativeBuffer = reinterpret_cast<ANativeWindowBuffer*>(buffer);
