On Fri, 2007-05-25 at 09:11 -0600, Brian Paul wrote: > Michel Dänzer wrote: > > On Fri, 2007-05-25 at 08:56 -0600, Brian Paul wrote: > >> Brad King wrote: > >>> Hello, > >>> > >>> This change: > >>> > >>> git-diff > >>> fd54564f78d4aeae2c39ada7502ec659c14b3eca..24d965fab52f790188e5de6e67e7387809b1f145 > >>> src/mesa/drivers/x11/xm_api.c > >>> > >>> has broken the nightly build of Mesa I use to test it with VTK. > >>> Compilation fails since GL/glxtokens.h is not available. > > > > It's available in the xorg/proto/glproto module FWIW. > > > >>> The xm_api.c source file is the only place outside src/glut/glx > >>> that includes this header. > >>> > >>> As a result I do not yet know whether Brian's recent fixes to my depth > >>> peeling problem worked. > >> AFAICT, that #include isn't needed. I'll remove it. > > > > I added it for the xserver build to get the definitions of the GLX > > tokens. Should it use another header for that? > > The texture-from-pixmap tokens are in include/GL/glx.h > > glxtokens.h isn't used by stand-alone Mesa's Xlib driver, nor included > in the Mesa release tarballs.
Yeah, it only seems to be in glproto. There are some overlaps and possibly discrepancies between the headers there and in Mesa. > If we really do need glxtokens.h for in the X server build (I haven't > checked that), the #include should probably go in the mesa_xf86.h header. That works here. -- Earthling Michel Dänzer | http://tungstengraphics.com Libre software enthusiast | Debian, X and DRI developer ------------------------------------------------------------------------- This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ _______________________________________________ Mesa3d-dev mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
