OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

egl: fold Android logger into main/

Browse Source 
Will allow us to greatly simplify a lot of the code in egllog.c

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
Reviewed-by: Chad Versace <chadversary@chromium.org>
This commit is contained in:
Emil Velikov
2017-05-04 19:10:21 +01:00
committed by Emil Velikov
parent 716e5db610
commit 0372097eec
3 changed files with 36 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/egl/drivers/dri2/egl_dri2.h
View File

@@ -59,7 +59,6 @@
#include <system/window.h> #include <system/window.h>
#include <hardware/gralloc.h> #include <hardware/gralloc.h>
#include <gralloc_drm_handle.h> #include <gralloc_drm_handle.h>
#include <cutils/log.h>
#endif /* HAVE_ANDROID_PLATFORM */ #endif /* HAVE_ANDROID_PLATFORM */

34
src/egl/drivers/dri2/platform_android.c
View File

@@ -1045,38 +1045,6 @@ droid_open_device(struct dri2_egl_display *dri2_dpy)
return (fd >= 0) ? fcntl(fd, F_DUPFD_CLOEXEC, 3) : -1; 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 = { static struct dri2_egl_display_vtbl droid_display_vtbl = {
.authenticate = NULL, .authenticate = NULL,
.create_window_surface = droid_create_window_surface, .create_window_surface = droid_create_window_surface,
@@ -1133,8 +1101,6 @@ dri2_initialize_android(_EGLDriver *drv, _EGLDisplay *dpy)
const char *err; const char *err;
int ret; int ret;
_eglSetLogProc(droid_log);
loader_set_logger(_eglLog); loader_set_logger(_eglLog);
dri2_dpy = calloc(1, sizeof(*dri2_dpy)); dri2_dpy = calloc(1, sizeof(*dri2_dpy));

36
src/egl/main/egllog.c
View File

@@ -44,6 +44,23 @@
#include "egllog.h" #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 MAXSTRING 1000
#define FALLBACK_LOG_LEVEL _EGL_WARNING #define FALLBACK_LOG_LEVEL _EGL_WARNING
@@ -107,7 +124,26 @@ _eglSetLogProc(_EGLLogProc logger)
static void static void
_eglDefaultLogger(EGLint level, const char *msg) _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); fprintf(stderr, "libEGL %s: %s\n", level_strings[level], msg);
#endif /* HAVE_ANDROID_PLATFORM */
} }