Android: Introduce ANDROID_HOST_BUILD and rework logging. Avoid using the Android logger directly. Instead, use the Common/Debug and OpenGL/common/debug paths instead, which abstracts away use of the logger. Add ANDRIOD_HOST_BUILD to tell the build we are building an Android swiftshader, but minimizing the use of platform features such as the logger. Change-Id: Ic6c70843d947c568d0e29fe66c55af74b8559a59 Reviewed-on: https://swiftshader-review.googlesource.com/18028 Tested-by: Alistair Strachan <astrachan@google.com> Reviewed-by: Greg Hartman <ghartman@google.com> Reviewed-by: Lingfeng Yang <lfy@google.com> Reviewed-by: Nicolas Capens <nicolascapens@google.com>
diff --git a/src/OpenGL/libEGL/Display.cpp b/src/OpenGL/libEGL/Display.cpp index 5821ba9..8bbed9e 100644 --- a/src/OpenGL/libEGL/Display.cpp +++ b/src/OpenGL/libEGL/Display.cpp
@@ -668,12 +668,12 @@ #elif defined(__ANDROID__) if(!window) { - ALOGE("%s called with window==NULL %s:%d", __FUNCTION__, __FILE__, __LINE__); + ERR("%s called with window==NULL %s:%d", __FUNCTION__, __FILE__, __LINE__); return false; } if(static_cast<ANativeWindow*>(window)->common.magic != ANDROID_NATIVE_WINDOW_MAGIC) { - ALOGE("%s called with window==%p bad magic %s:%d", __FUNCTION__, window, __FILE__, __LINE__); + ERR("%s called with window==%p bad magic %s:%d", __FUNCTION__, window, __FILE__, __LINE__); return false; } return true;
diff --git a/src/OpenGL/libEGL/libEGL.cpp b/src/OpenGL/libEGL/libEGL.cpp index b2ef237..a4f078d 100644 --- a/src/OpenGL/libEGL/libEGL.cpp +++ b/src/OpenGL/libEGL/libEGL.cpp
@@ -1172,7 +1172,7 @@ if(!nativeBuffer || GLPixelFormatFromAndroid(nativeBuffer->format) == GL_NONE) { - ALOGW("%s badness unsupported HAL format=%x", __FUNCTION__, nativeBuffer ? nativeBuffer->format : 0); + ERR("%s badness unsupported HAL format=%x", __FUNCTION__, nativeBuffer ? nativeBuffer->format : 0); return error(EGL_BAD_ATTRIBUTE, EGL_NO_IMAGE_KHR); }