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?


Cheers,

Tom
commit 1ec71094a35ae3306ce797fec838eb9b8edf96ac
Author: Tom Cooksey <tomcook...@gmail.com>
Date:   Thu Feb 25 22:53:08 2010 +0100

    Don't include X11 headers from eglplatform.h
    
    In addition to defining Display, Pixmap & Window, they also define
    symbols like "Done" which may be break application code.

diff --git a/include/EGL/eglplatform.h b/include/EGL/eglplatform.h
index c625088..ea37a6d 100644
--- 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;
 
 #else
 #error "Platform not recognized"
------------------------------------------------------------------------------
Download Intel&#174; 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

Reply via email to