forked from enlightenment/efl
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. SVN revision: 57558
This commit is contained in:
parent
ea5e9b6773
commit
ccfe91cc58
|
@ -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
|
||||
|
|
|
@ -32,7 +32,6 @@
|
|||
# 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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue