egl: simplify the Android logger

Drop the unsupported pre-JellyBean macros and use a simple egl2android
mapping. With this we loose the explicit abort() provided by LOG_FATAL,
although Mesa already already calls exit(1) in case of a fatal errors.

Suggested-by: Rob Herring <robh@kernel.org>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Rob Herring <robh@kernel.org>

diff --git a/src/egl/main/egllog.c b/src/egl/main/egllog.c
index bf0ee017b891ee31a82a53f249cc490ba4f813e0..6de2a50b451d5f2df2f9a24870885cacc3efee02 100644 (file)
--- a/src/egl/main/egllog.c
+++ b/src/egl/main/egllog.c
@@ -49,17 +49,6 @@
 #define LOG_TAG "EGL-MAIN"
 #include <cutils/log.h>
 
-/* support versions < JellyBean */
-#ifndef ALOGW
-#define ALOGW LOGW
-#endif
-#ifndef ALOGD
-#define ALOGD LOGD
-#endif
-#ifndef ALOGI
-#define ALOGI LOGI
-#endif
-
 #endif /* HAVE_ANDROID_PLATFORM */
 
 #define MAXSTRING 1000
@@ -92,22 +81,13 @@ static void
 _eglDefaultLogger(EGLint level, const char *msg)
 {
 #ifdef HAVE_ANDROID_PLATFORM
-   switch (level) {
-   case _EGL_DEBUG:
-      ALOGD("%s", msg);
-      break;
-   case _EGL_INFO:
-      ALOGI("%s", msg);
-      break;
-   case _EGL_WARNING:
-      ALOGW("%s", msg);
-      break;
-   case _EGL_FATAL:
-      LOG_FATAL("%s", msg);
-      break;
-   default:
-      break;
-   }
+   static const int egl2alog[] = {
+      [_EGL_FATAL] = LOG_ERROR,
+      [_EGL_WARNING]  = LOG_WARN,
+      [_EGL_INFO] = LOG_INFO,
+      [_EGL_DEBUG] = LOG_DEBUG,
+   };
+   ALOG(egl2alog[level], LOG_TAG, "%s", msg);
 #else
    fprintf(stderr, "libEGL %s: %s\n", level_strings[level], msg);
 #endif /* HAVE_ANDROID_PLATFORM */