fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 19:30:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

egl: simplify the Android logger

Browse source 
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>
This commit is contained in:
Emil Velikov 2017-05-08 15:38:11 +01:00 • committed by Emil Velikov
parent bec1c13be2
commit 1ce58536ec
1 changed files with 7 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/egl/main/egllog.c
View file

@ -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 */