Hi, On Fri, Feb 26, 2010 at 07:31:07AM +0100, Tom Cooksey wrote: > With the attached patch applied, I can build Qt against Mesa's EGL & > GLES2 libraries as they currently stand in master. What's more, > examples/opengl/hellogl_es2 runs perfectly against the gallium swrast > driver. The i965 driver was less successful however (my X server > died). :-/ > > Dunno if people will agree with the patch, but I'd imagine it's not > just Qt which will have problems with egl including X11 headers?
Doesn't Qt already have guards for X definitions such as Display, Pixmap and Window? > --- a/include/EGL/eglplatform.h > +++ b/include/EGL/eglplatform.h > @@ -80,13 +80,9 @@ typedef void *EGLNativePixmapType; > > #elif defined(__unix__) || defined(__unix) > > -/* X11 (tentative) */ > -#include <X11/Xlib.h> > -#include <X11/Xutil.h> > - > -typedef Display *EGLNativeDisplayType; > -typedef Pixmap EGLNativePixmapType; > -typedef Window EGLNativeWindowType; > +typedef struct _XDisplay *EGLNativeDisplayType; > +typedef unsigned long EGLNativePixmapType; > +typedef unsigned long EGLNativeWindowType; In any case, you might as well just call the native display type void *. Cheers, Daniel
pgpfAFynvSsud.pgp
Description: PGP signature
------------------------------------------------------------------------------ Download Intel® Parallel Studio Eval Try the new software tools for yourself. Speed compiling, find bugs proactively, and fine-tune applications for parallel performance. See why Intel Parallel Studio got high marks during beta. http://p.sf.net/sfu/intel-sw-dev
_______________________________________________ Mesa3d-dev mailing list Mesa3d-dev@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
