diff options
| author | Emil Velikov <[email protected]> | 2017-05-08 15:38:11 +0100 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2017-05-11 13:58:20 +0100 |
| commit | 1ce58536ec23e1253a9bf5949ad3f3396d160b83 (patch) | |
| tree | 361c2bab739f9ea5709286ee1e937a271db081e3 /src | |
| parent | bec1c13be2154dfb20baa4fbb33b1560a4ef1910 (diff) | |
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 <[email protected]>
Signed-off-by: Emil Velikov <[email protected]>
Reviewed-by: Rob Herring <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/egl/main/egllog.c | 34 |
1 files changed, 7 insertions, 27 deletions
diff --git a/src/egl/main/egllog.c b/src/egl/main/egllog.c index bf0ee017b89..6de2a50b451 100644 --- 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 */ |