jsuya
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Evas (wayland_egl): Fix compiler warnings. Use proper log_domain name. 

Fix static build of the engine. Define the proper module name.



SVN revision: 71116
This commit is contained in:
Christopher Michael 2012-05-15 13:21:01 +00:00
parent a4cfab66ab
commit 5fbecabb43
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
legacy/evas/src/modules/engines/wayland_egl/evas_engine.c
View File

@ -1911,7 +1911,7 @@ eng_image_stride_get(void *data __UNUSED__, void *image, int *stride)
} }
static void static void
eng_font_draw(void *data, void *context, void *surface, Evas_Font_Set *font, int x, int y, int w __UNUSED__, int h __UNUSED__, int ow __UNUSED__, int oh __UNUSED__, const Evas_Text_Props *intl_props) eng_font_draw(void *data, void *context, void *surface, Evas_Font_Set *font __UNUSED__, int x, int y, int w __UNUSED__, int h __UNUSED__, int ow __UNUSED__, int oh __UNUSED__, const Evas_Text_Props *intl_props)
{ {
Render_Engine *re; Render_Engine *re;
@ -2900,7 +2900,7 @@ module_open(Evas_Module *em)
if (_evas_engine_wl_egl_log_dom < 0) if (_evas_engine_wl_egl_log_dom < 0)
{ {
_evas_engine_wl_egl_log_dom = _evas_engine_wl_egl_log_dom =
eina_log_domain_register("evas-gl_x11", EVAS_DEFAULT_LOG_COLOR); eina_log_domain_register("evas-wayland_egl", EVAS_DEFAULT_LOG_COLOR);
} }
if (_evas_engine_wl_egl_log_dom < 0) if (_evas_engine_wl_egl_log_dom < 0)
@ -3022,10 +3022,10 @@ static Evas_Module_Api evas_modapi =
EVAS_MODULE_API_VERSION, "wayland_egl", "none", {module_open, module_close} EVAS_MODULE_API_VERSION, "wayland_egl", "none", {module_open, module_close}
}; };
EVAS_MODULE_DEFINE(EVAS_MODULE_TYPE_ENGINE, engine, gl_x11); EVAS_MODULE_DEFINE(EVAS_MODULE_TYPE_ENGINE, engine, wayland_egl);
#ifndef EVAS_STATIC_BUILD_GL_XLIB #ifndef EVAS_STATIC_BUILD_WAYLAND_EGL
EVAS_EINA_MODULE_DEFINE(engine, gl_x11); EVAS_EINA_MODULE_DEFINE(engine, wayland_egl);
#endif #endif
/* vim:set ts=8 sw=3 sts=3 expandtab cino=>5n-2f0^-2{2(0W1st0 :*/ /* vim:set ts=8 sw=3 sts=3 expandtab cino=>5n-2f0^-2{2(0W1st0 :*/

8
legacy/evas/src/modules/engines/wayland_egl/evas_wl_main.c
View File

@ -144,8 +144,8 @@ eng_window_new(struct wl_display *disp, struct wl_surface *surface, int screen,
NULL); NULL);
if (gw->egl_surface[0] == EGL_NO_SURFACE) if (gw->egl_surface[0] == EGL_NO_SURFACE)
{ {
ERR("eglCreateWindowSurface() fail for %#x. code=%#x", ERR("eglCreateWindowSurface() fail for %p. code=%#x",
(unsigned int)gw->win, eglGetError()); gw->win, eglGetError());
eng_window_free(gw); eng_window_free(gw);
return NULL; return NULL;
} }
@ -297,8 +297,8 @@ eng_window_resurf(Evas_GL_Wl_Window *gw)
if (gw->egl_surface[0] == EGL_NO_SURFACE) if (gw->egl_surface[0] == EGL_NO_SURFACE)
{ {
ERR("eglCreateWindowSurface() fail for %#x. code=%#x", ERR("eglCreateWindowSurface() fail for %p. code=%#x",
(unsigned int)gw->win, eglGetError()); gw->win, eglGetError());
return; return;
} }
if (eglMakeCurrent(gw->egl_disp, gw->egl_surface[0], gw->egl_surface[0], if (eglMakeCurrent(gw->egl_disp, gw->egl_surface[0], gw->egl_surface[0],