Re: Re: Submits galore

hmmm,

very strange, what gl.h and glext.h header you are using ?
can you send me the two ?

PS: As jason have some compilation problems too as it use a specific gl.h with a generic glext.h, i'm thinking about not using anymore the gl/glext headers definitions (i'm too bored to fixes each mismatch headers declaration)

Regards,
Raphael
> > It seems Alexandre is back or just got tired of the patch storm :) D3D-lovers should update from CVS I'd say.
>
> Do I get the following because I'm not?
>
> | make[2]: Entering directory `/usr/home/projects/wine/mywine/dlls/d3d8'
> | gcc -c -I. -I. -I../../include -I../../include -I/usr/X11R6/include -D_REENTRANT -fPIC -D__WINESRC__  -Wall -mpreferred-stack-boundary=2 -gstabs+ -Wpointer-arith -g -O2 -o basetexture.o basetexture.c
> | In file included from ../../include/objbase.h:306,
> |                  from ../../include/d3d8.h:22,
> |                  from d3d8_private.h:55,
> |                  from basetexture.c:29:
> | ../../include/objidl.h:5960: warning: declaration does not declare anything
> | In file included from basetexture.c:29:
> | d3d8_private.h:198: error: parse error before "PFNGLCOLORTABLEEXTPROC"
> | d3d8_private.h:198: warning: no semicolon at end of struct or union
> | d3d8_private.h:198: error: parse error before "glPointParameterfEXT"
> | d3d8_private.h:198: warning: type defaults to `int' in declaration of `glPointParameterfEXT'
> | d3d8_private.h:198: error: `glPointParameterfEXT' redeclared as different kind of symbol
> | /usr/include/GL/gl.h:2484: error: previous declaration of `glPointParameterfEXT'
> | d3d8_private.h:198: warning: data definition has no type or storage class
> | d3d8_private.h:198: error: parse error before "glPointParameterfvEXT"
> | d3d8_private.h:198: warning: type defaults to `int' in declaration of `glPointParameterfvEXT'
> | d3d8_private.h:198: error: `glPointParameterfvEXT' redeclared as different kind of symbol
> | /usr/include/GL/gl.h:2485: error: previous declaration of `glPointParameterfvEXT'
> | d3d8_private.h:198: warning: data definition has no type or storage class
> | d3d8_private.h:198: error: parse error before "glSecondaryColor3ubEXT"
> | d3d8_private.h:198: warning: type defaults to `int' in declaration of `glSecondaryColor3ubEXT'
> | d3d8_private.h:198: error: `glSecondaryColor3ubEXT' redeclared as different kind of symbol
> | /usr/include/GL/gl.h:2562: error: previous declaration of `glSecondaryColor3ubEXT'
> | d3d8_private.h:198: warning: data definition has no type or storage class
> | d3d8_private.h:198: error: parse error before "glSecondaryColor3fEXT"
> | d3d8_private.h:198: warning: type defaults to `int' in declaration of `glSecondaryColor3fEXT'
> | d3d8_private.h:198: error: `glSecondaryColor3fEXT' redeclared as different kind of symbol
> | /usr/include/GL/gl.h:2556: error: previous declaration of `glSecondaryColor3fEXT'
> | d3d8_private.h:198: warning: data definition has no type or storage class
> | d3d8_private.h:198: error: parse error before "glSecondaryColor3fvEXT"
> | d3d8_private.h:198: warning: type defaults to `int' in declaration of `glSecondaryColor3fvEXT'
> | d3d8_private.h:198: error: `glSecondaryColor3fvEXT' redeclared as different kind of symbol
> | /usr/include/GL/gl.h:2557: error: previous declaration of `glSecondaryColor3fvEXT'
> | d3d8_private.h:198: warning: data definition has no type or storage class
> | d3d8_private.h:198: error: parse error before "glSecondaryColorPointerEXT"
> | d3d8_private.h:198: warning: type defaults to `int' in declaration of `glSecondaryColorPointerEXT'
> | d3d8_private.h:198: error: `glSecondaryColorPointerEXT' redeclared as different kind of symbol
> | /usr/include/GL/gl.h:2568: error: previous declaration of `glSecondaryColorPointerEXT'
> | d3d8_private.h:198: warning: data definition has no type or storage class
> | d3d8_private.h:200: error: parse error before '}' token
> | d3d8_private.h:200: warning: type defaults to `int' in declaration of `GL_Info'
> | d3d8_private.h:200: warning: data definition has no type or storage class
> | d3d8_private.h:256: error: parse error before "GL_Info"
> | d3d8_private.h:256: warning: no semicolon at end of struct or union
> | make[2]: *** [basetexture.o] Error 1
> | make[2]: Leaving directory `/usr/home/projects/wine/mywine/dlls/d3d8'
> | make[1]: *** [d3d8] Error 2
> | make[1]: Leaving directory `/usr/home/projects/wine/mywine/dlls'
> | make: *** [dlls] Error 2
> Rein.
>
> Rein Klazes
> [e-mail]

Submits galore

[Lionel Ulmer]

> PS: As jason have some compilation problems too as it use a specific gl.h
> with a generic glext.h, i'm thinking about not using anymore the gl/glext
> headers definitions (i'm too bored to fixes each mismatch headers
> declaration)

Well, I would say that we use the standard gl.h file (otherwise it's too
messy) but completely remove the dependency on glext.h.

I plan to change all _EXT and _ARB stuff in the D3D7 code by _WINE #defines
(defined from the GL extension specs) and to never use at all the function
pointer typedef and use my own.

Basically, my baseline would be GL 1.2 and all the rest would be redefined.

Lionel