Mesa (master): egl: fold Android logger into main/
Emil Velikov
evelikov at kemper.freedesktop.org
Mon May 8 14:40:52 UTC 2017
Module: Mesa
Branch: master
Commit: 0372097eec315397d6aa5c5cc516389df1faccaf
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0372097eec315397d6aa5c5cc516389df1faccaf
Author: Emil Velikov <emil.velikov at collabora.com>
Date: Thu May 4 19:10:21 2017 +0100
egl: fold Android logger into main/
Will allow us to greatly simplify a lot of the code in egllog.c
Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
Reviewed-by: Eric Engestrom <eric at engestrom.ch>
Reviewed-by: Chad Versace <chadversary at chromium.org>
---
src/egl/drivers/dri2/egl_dri2.h | 1 -
src/egl/drivers/dri2/platform_android.c | 34 -------------------------------
src/egl/main/egllog.c | 36 +++++++++++++++++++++++++++++++++
3 files changed, 36 insertions(+), 35 deletions(-)
diff --git a/src/egl/drivers/dri2/egl_dri2.h b/src/egl/drivers/dri2/egl_dri2.h
index f16663712d..b1e224248c 100644
--- a/src/egl/drivers/dri2/egl_dri2.h
+++ b/src/egl/drivers/dri2/egl_dri2.h
@@ -59,7 +59,6 @@
#include <system/window.h>
#include <hardware/gralloc.h>
#include <gralloc_drm_handle.h>
-#include <cutils/log.h>
#endif /* HAVE_ANDROID_PLATFORM */
diff --git a/src/egl/drivers/dri2/platform_android.c b/src/egl/drivers/dri2/platform_android.c
index b727699787..49cbeb4698 100644
--- a/src/egl/drivers/dri2/platform_android.c
+++ b/src/egl/drivers/dri2/platform_android.c
@@ -1045,38 +1045,6 @@ droid_open_device(struct dri2_egl_display *dri2_dpy)
return (fd >= 0) ? fcntl(fd, F_DUPFD_CLOEXEC, 3) : -1;
}
-/* support versions < JellyBean */
-#ifndef ALOGW
-#define ALOGW LOGW
-#endif
-#ifndef ALOGD
-#define ALOGD LOGD
-#endif
-#ifndef ALOGI
-#define ALOGI LOGI
-#endif
-
-static void
-droid_log(EGLint level, const char *msg)
-{
- 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 struct dri2_egl_display_vtbl droid_display_vtbl = {
.authenticate = NULL,
.create_window_surface = droid_create_window_surface,
@@ -1133,8 +1101,6 @@ dri2_initialize_android(_EGLDriver *drv, _EGLDisplay *dpy)
const char *err;
int ret;
- _eglSetLogProc(droid_log);
-
loader_set_logger(_eglLog);
dri2_dpy = calloc(1, sizeof(*dri2_dpy));
diff --git a/src/egl/main/egllog.c b/src/egl/main/egllog.c
index c830748290..9d7e930234 100644
--- a/src/egl/main/egllog.c
+++ b/src/egl/main/egllog.c
@@ -44,6 +44,23 @@
#include "egllog.h"
+#ifdef HAVE_ANDROID_PLATFORM
+#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
#define FALLBACK_LOG_LEVEL _EGL_WARNING
@@ -107,7 +124,26 @@ _eglSetLogProc(_EGLLogProc logger)
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;
+ }
+#else
fprintf(stderr, "libEGL %s: %s\n", level_strings[level], msg);
+#endif /* HAVE_ANDROID_PLATFORM */
}
More information about the mesa-commit
mailing list