devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=f14a893ce505c8436f4cfa2377b1db470eb85fb2
commit f14a893ce505c8436f4cfa2377b1db470eb85fb2 Author: Chris Michael <[email protected]> Date: Sun Mar 1 10:45:39 2015 -0500 evas-gl-drm: Cleanup compiler warnings for dbg/err messages Summary: This commit compiles out the debug messages that were generating compiler warnings during build. You can reenable these messages if you uncomment GL_DRM_DBG in evas_engine.h @fix Signed-off-by: Chris Michael <[email protected]> --- src/modules/evas/engines/gl_drm/evas_drm_main.c | 3 +++ src/modules/evas/engines/gl_drm/evas_engine.c | 6 +++++- src/modules/evas/engines/gl_drm/evas_engine.h | 3 +++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/modules/evas/engines/gl_drm/evas_drm_main.c b/src/modules/evas/engines/gl_drm/evas_drm_main.c index 67b1648..d0fe125 100644 --- a/src/modules/evas/engines/gl_drm/evas_drm_main.c +++ b/src/modules/evas/engines/gl_drm/evas_drm_main.c @@ -118,7 +118,10 @@ eng_window_new(Evas_Engine_Info_GL_Drm *info, Evas *e, struct gbm_device *gbm, s config_attrs[n++] = EGL_OPENGL_ES2_BIT; config_attrs[n++] = EGL_NONE; +#ifdef GL_DRM_DBG DBG("GBM DEVICE: %x", (unsigned int)gbm); +#endif + gw->egl_disp = eglGetDisplay((EGLNativeDisplayType)(gw->gbm)); if (gw->egl_disp == EGL_NO_DISPLAY) { diff --git a/src/modules/evas/engines/gl_drm/evas_engine.c b/src/modules/evas/engines/gl_drm/evas_engine.c index 6e4b119..2152e88 100644 --- a/src/modules/evas/engines/gl_drm/evas_engine.c +++ b/src/modules/evas/engines/gl_drm/evas_engine.c @@ -600,9 +600,11 @@ eng_setup(Evas *eo_e, void *in) if (!(info->info.gbm) || !(info->info.surface)) return 0; +#ifdef GL_DRM_DBG DBG("FD: %d, GBM_DEVICE: 0x%x, GBM_SURFACE: 0x%x", info->info.fd, (unsigned int)info->info.gbm, (unsigned int)info->info.surface); +#endif re = calloc(1, sizeof(Render_Engine)); if (!re) return 0; @@ -724,9 +726,11 @@ eng_setup(Evas *eo_e, void *in) if (!evas_drm_gbm_init(info, epd->output.w, epd->output.h)) return 0; +#ifdef GL_DRM_DBG DBG("FD: %d, GBM_DEVICE: 0x%x, GBM_SURFACE: 0x%x", info->info.fd, (unsigned int)info->info.gbm, (unsigned int)info->info.surface); +#endif ob = eng_window_new(info, eo_e, info->info.gbm, info->info.surface, info->info.screen, @@ -1107,7 +1111,7 @@ eng_image_native_set(void *data, void *image, void *native) if (!n->egl_surface) { - ERR("eglCreatePixmapSurface() for 0x%x failed", (unsigned int)wl_buf); + ERR("eglCreatePixmapSurface() for %p failed", wl_buf); eina_hash_del(ob->gl_context->shared->native_wl_hash, &wlid, img); glsym_evas_gl_common_image_free(img); free(n); diff --git a/src/modules/evas/engines/gl_drm/evas_engine.h b/src/modules/evas/engines/gl_drm/evas_engine.h index 622f832..47add69 100644 --- a/src/modules/evas/engines/gl_drm/evas_engine.h +++ b/src/modules/evas/engines/gl_drm/evas_engine.h @@ -38,6 +38,9 @@ extern Evas_GL_Common_Buffer_Dump_Call glsym_evas_gl_common_buffer_dump; extern Evas_GL_Preload_Render_Call glsym_evas_gl_preload_render_lock; extern Evas_GL_Preload_Render_Call glsym_evas_gl_preload_render_unlock; +/* define this to enable debug for the gl_drm engine */ +/* #define GL_DRM_DBG 0 */ + # ifdef ERR # undef ERR # endif --
