From 15de771a37278f8389d5193aced467646f0c1b97 Mon Sep 17 00:00:00 2001 From: raster Date: Mon, 7 Mar 2011 19:11:18 +0000 Subject: [PATCH] REVERT! hell no. glu is not going to become a dependency. it never was. you broke gl-es support and didnt link to glu either. it's a separate lib. no no no no no. git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@57558 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- ChangeLog | 5 ----- src/modules/engines/gl_x11/evas_engine.h | 3 +-- src/modules/engines/gl_x11/evas_x_main.c | 4 ++-- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 23f0ae3..3e796e7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -135,8 +135,3 @@ 2011-02-27 Vincent Torri * Fixed static linking of the bmp, wbmp and tga loaders - -2011-03-07 Mike Blumenkrantz - - * Fix segv when trying to set gl viewpoint with NULL ctx - * Add more verbose error message when glXMakeCurrent fails diff --git a/src/modules/engines/gl_x11/evas_engine.h b/src/modules/engines/gl_x11/evas_engine.h index ae9ccbd..30a0c04 100644 --- a/src/modules/engines/gl_x11/evas_engine.h +++ b/src/modules/engines/gl_x11/evas_engine.h @@ -24,7 +24,7 @@ # include # include # include // xres - dpi -# endif +#endif # else # include # include @@ -32,7 +32,6 @@ # include # include // xres - dpi # include -# include # include # include # endif diff --git a/src/modules/engines/gl_x11/evas_x_main.c b/src/modules/engines/gl_x11/evas_x_main.c index 28a13ef..95437dd 100644 --- a/src/modules/engines/gl_x11/evas_x_main.c +++ b/src/modules/engines/gl_x11/evas_x_main.c @@ -300,7 +300,7 @@ eng_window_new(Display *disp, { if (!glXMakeCurrent(gw->disp, gw->win, gw->context)) { - printf("Error: glXMakeCurrent(%p, 0x%x, %p) failed - '%s'\n", (void *)gw->disp, (unsigned int)gw->win, (void *)gw->context, gluErrorString(glGetError())); + printf("Error: glXMakeCurrent(%p, 0x%x, %p) failed\n", (void *)gw->disp, (unsigned int)gw->win, (void *)gw->context); eng_window_free(gw); return NULL; } @@ -531,7 +531,7 @@ eng_window_use(Evas_GL_X11_Window *gw) #endif } } - if (gw && gw->gl_context) evas_gl_common_context_use(gw->gl_context); + if (gw) evas_gl_common_context_use(gw->gl_context); } void -- 2.7.4