On Mon, Mar 7, 2011 at 6:41 AM, Enlightenment SVN <no-re...@enlightenment.org> wrote: > Log: > fix weird segv I found when trying opengl mode in comp module on my desktop, > waiting for someone to give me the "good job you did it correctly" before I > backport since I probably didn't
Just reading the patch, seems like you added GLU as a dependency without checking for it before ? Does evas already rely on GLU ? > Author: discomfitor > Date: 2011-03-06 21:41:49 -0800 (Sun, 06 Mar 2011) > New Revision: 57546 > Trac: http://trac.enlightenment.org/e/changeset/57546 > > Modified: > trunk/evas/ChangeLog trunk/evas/src/modules/engines/gl_x11/evas_engine.h > trunk/evas/src/modules/engines/gl_x11/evas_x_main.c > > Modified: trunk/evas/ChangeLog > =================================================================== > --- trunk/evas/ChangeLog 2011-03-06 23:28:37 UTC (rev 57545) > +++ trunk/evas/ChangeLog 2011-03-07 05:41:49 UTC (rev 57546) > @@ -135,3 +135,8 @@ > 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 > > Modified: trunk/evas/src/modules/engines/gl_x11/evas_engine.h > =================================================================== > --- trunk/evas/src/modules/engines/gl_x11/evas_engine.h 2011-03-06 23:28:37 > UTC (rev 57545) > +++ trunk/evas/src/modules/engines/gl_x11/evas_engine.h 2011-03-07 05:41:49 > UTC (rev 57546) > @@ -24,7 +24,7 @@ > # include <X11/Xutil.h> > # include <X11/extensions/Xrender.h> > # include <X11/Xresource.h> // xres - dpi > -#endif > +# endif > # else > # include <X11/Xlib.h> > # include <X11/Xatom.h> > @@ -32,6 +32,7 @@ > # include <X11/extensions/Xrender.h> > # include <X11/Xresource.h> // xres - dpi > # include <GL/gl.h> > +# include <GL/glu.h> > # include <GL/glext.h> > # include <GL/glx.h> > # endif > > Modified: trunk/evas/src/modules/engines/gl_x11/evas_x_main.c > =================================================================== > --- trunk/evas/src/modules/engines/gl_x11/evas_x_main.c 2011-03-06 23:28:37 > UTC (rev 57545) > +++ trunk/evas/src/modules/engines/gl_x11/evas_x_main.c 2011-03-07 05:41:49 > UTC (rev 57546) > @@ -300,7 +300,7 @@ > { > if (!glXMakeCurrent(gw->disp, gw->win, gw->context)) > { > - printf("Error: glXMakeCurrent(%p, 0x%x, %p) failed\n", > (void *)gw->disp, (unsigned int)gw->win, (void *)gw->context); > + printf("Error: glXMakeCurrent(%p, 0x%x, %p) failed - > '%s'\n", (void *)gw->disp, (unsigned int)gw->win, (void *)gw->context, > gluErrorString(glGetError())); > eng_window_free(gw); > return NULL; > } > @@ -531,7 +531,7 @@ > #endif > } > } > - if (gw) evas_gl_common_context_use(gw->gl_context); > + if (gw && gw->gl_context) evas_gl_common_context_use(gw->gl_context); > } > > void > > > ------------------------------------------------------------------------------ > What You Don't Know About Data Connectivity CAN Hurt You > This paper provides an overview of data connectivity, details > its effect on application quality, and explores various alternative > solutions. http://p.sf.net/sfu/progress-d2d > _______________________________________________ > enlightenment-svn mailing list > enlightenment-...@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-svn > > -- Cedric BAIL ------------------------------------------------------------------------------ What You Don't Know About Data Connectivity CAN Hurt You This paper provides an overview of data connectivity, details its effect on application quality, and explores various alternative solutions. http://p.sf.net/sfu/progress-d2d _______________________________________________ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
