diff options
| author | Chia-I Wu <olvaffe@gmail.com> | 2011-08-04 11:54:43 +0900 |
|---|---|---|
| committer | Chia-I Wu <olvaffe@gmail.com> | 2011-08-04 12:00:51 +0900 |
| commit | f07dbb643f2db4fb2d4f7f049b164d103c10769e (patch) | |
| tree | ffe5449674a986b80a345bcaaa76cdc951ba526d | |
| parent | 6b9cd32849c1da5ed559411a2899cf5989a5373b (diff) | |
egl_dri2: set log proc upon initialization
| -rw-r--r-- | src/egl/drivers/dri2/egl_dri2.c | 29 | ||||
| -rw-r--r-- | src/egl/drivers/dri2/platform_android.c | 23 |
2 files changed, 24 insertions, 28 deletions
diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c index a44336aa47..2efa291951 100644 --- a/src/egl/drivers/dri2/egl_dri2.c +++ b/src/egl/drivers/dri2/egl_dri2.c @@ -609,7 +609,7 @@ dri2_terminate(_EGLDriver *drv, _EGLDisplay *disp) dri2_dpy->core->destroyScreen(dri2_dpy->dri_screen); if (dri2_dpy->fd) close(dri2_dpy->fd); -#ifdef ANDROID +#ifdef HAVE_ANDROID_PLATFORM /* * _mesa_destroy_shader_compiler is called at atexit() time. We can not * unload the driver now. @@ -1418,29 +1418,6 @@ dri2_unload(_EGLDriver *drv) free(dri2_drv); } -#ifdef HAVE_ANDROID_PLATFORM -static void -android_log(EGLint level, const char *msg) -{ - switch (level) { - case _EGL_DEBUG: - LOGD(msg); - break; - case _EGL_INFO: - LOGI(msg); - break; - case _EGL_WARNING: - LOGW(msg); - break; - case _EGL_FATAL: - LOG_FATAL(msg); - break; - default: - break; - } -} -#endif - static EGLBoolean dri2_load(_EGLDriver *drv) { @@ -1506,10 +1483,6 @@ _EGL_MAIN(const char *args) if (!dri2_load(&dri2_drv->base)) return NULL; -#ifdef HAVE_ANDROID_PLATFORM - _eglSetLogProc(android_log); -#endif - _eglInitDriverFallbacks(&dri2_drv->base); dri2_drv->base.API.Initialize = dri2_initialize; dri2_drv->base.API.Terminate = dri2_terminate; diff --git a/src/egl/drivers/dri2/platform_android.c b/src/egl/drivers/dri2/platform_android.c index bdc71408d9..58d37ddc72 100644 --- a/src/egl/drivers/dri2/platform_android.c +++ b/src/egl/drivers/dri2/platform_android.c @@ -532,12 +532,35 @@ droid_open_device(void) return (fd >= 0) ? dup(fd) : -1; } +static void +droid_log(EGLint level, const char *msg) +{ + switch (level) { + case _EGL_DEBUG: + LOGD(msg); + break; + case _EGL_INFO: + LOGI(msg); + break; + case _EGL_WARNING: + LOGW(msg); + break; + case _EGL_FATAL: + LOG_FATAL(msg); + break; + default: + break; + } +} + EGLBoolean dri2_initialize_android(_EGLDriver *drv, _EGLDisplay *dpy) { struct dri2_egl_display *dri2_dpy; const char *err; + _eglSetLogProc(droid_log); + dri2_dpy = calloc(1, sizeof(*dri2_dpy)); if (!dri2_dpy) return _eglError(EGL_BAD_ALLOC, "eglInitialize"); |