Re: Re: Re: Re: Submits galore

[Lionel Ulmer]

> original way to solve the problem, but as openGL1.2 is really a 
> few things you can redefine all openGL. (and i think it will be 
> better readable and workable than mixing GL_*_WINE and GL_*)

Well, we are already mixing GL_*_ARB, GL_*_EXT, GL_*_NV, ... Why not replace
all these extensions (which may or may not be defined in the header files)
by our own 'extension superset', called GL_*_WINE ?

> And if you do that (no more official gl.h include) you shouldn't 
> have anymore problem that you have used some GL_* only defined in 
> you official gl.h but not openGL1.2 compliant

Well, the problem with the approach you are using now in D3D8 is that you
are using the same name than the official one... And this could easily lead
to 'name clashes' with #define or typedef renaming.

So either we do everything ourselves or we go my way, but I do not think
your way is fixing all problems :-)

> Yes, you are right,
> but i prefer code readable :)

What is non-readable in what I propose ? You find _WINE so ugly ? You prefer
_ARB or _EXT ?

> so do it, i'll reuse it for d3d8 :)
> but do it for official OpenGL1.2 defines too (as i have commented 
> before)

Well, I already use 79 API calls in D3D7. And I did not count how many of
the GL enums, but surely more.

I think it would really be a pain to re-do all this ourselves. So if we go
the 'let's have our own extension files', at least take header files from an
'external vendor' (for example Mesa) and massage our code for it to work on
these headers.

At least if we have breakage, it will always be internal and never due to
external dependencies.

Or we could auto-generate these headers :-)

> well, i don't want to use the user installed gl.h (it can introduce
> breakage with "beautifuls" old specific headers), and i don't want to have
> all opengl headers into wine tree (wine don't need to install it adn we
> don't need all defines).

Can you tell me any breakage introduced by old gl.h ? If you tell me 'They
define extensions too !!!', this is not problem for my way as all extensions
would be redefined with the _WINE suffix :-)

Lionel

-- 
 Lionel Ulmer - http://www.bbrox.org/

Re: Submits galore

[Alexandre Julliard]

Sylvain Petreolle <[EMAIL PROTECTED]> writes:

> Alexandre, welcome back and wtg :)

Actually I'm not back, just taking a little break from my vacation to
try to keep the patch queue under control...

-- 
Alexandre Julliard
[EMAIL PROTECTED]

Re: Re: Re: Re: Submits galore

[fenix]

>Well, I would only use 1.2 defines from the GL headers. All the 
>rest would be prefixed or suffixed by _WINE so no risk of 
>conflicts.

original way to solve the problem, but as openGL1.2 is really a 
few things you can redefine all openGL. (and i think it will be 
better readable and workable than mixing GL_*_WINE and GL_*)
And if you do that (no more official gl.h include) you shouldn't 
have anymore problem that you have used some GL_* only defined in 
you official gl.h but not openGL1.2 compliant

>So even if the headers are ugly, I do not see how it could break 
>things.

Yes, you are right,
but i prefer code readable :)

>> i think you'll have many breakage :)
>
>Well, if I do the following, I wonder how I could have breakages 
>:-) :
>
>#define GL_COMBINE_RGB_WINE0x8571
>
>I.e. I do not plan to use ANY pre-defined values from the header 
>but to define them all myself.
>
>So tell me where I could have breakage ?

so do it, i'll reuse it for d3d8 :)
but do it for official OpenGL1.2 defines too (as i have commented 
before)

>> As you want,
>> But for me, I think building with GL1.4 (last ans most complete) 
>> headers and detecting/activing caps on runtime it's a more proper 
>> solution (no more #ifdef/#define in code, only in d3dcore_gl.h 
>> definitions).
>
>I cannot see how you can do this without shipping all the GL / 
>GLX 1.4 headers with Wine itself.

As we used only a few parts of OpenGL1.4/GLX1.3 (and you a smaller 
one) we can only define in a "small" header what we need for what 
we used (i find it the more proper solution)

First, i have thought that shipping official openGL headers into wine was the better 
solution (for opengl dll and d3d*). But as they should be installed into 
/include/wine now i think its better to only have a small header only 
for compilation.

>If you plan to redefine stuff, this is exactly what I planned to 
>do and you told that it would introduce breakage :-)

well, i don't want to use the user installed gl.h (it can introduce breakage with 
"beautifuls" old specific headers), and i don't want to have all opengl headers into 
wine tree (wine don't need to install it adn we don't need all defines).

> Lionel

Raphael

Re: Re: Re: Submits galore

[Lionel Ulmer]

> well, the problem is that gl.h defines ugly things too.
> as i have reports from users using mesa headers 3.4 (openGL 1.2 
> only declared but ugly pre 1.3 support) while using Mesa5.0 (very 
> easy to do: install a XFree4.0 and after install only mesa5)

Well, I would only use 1.2 defines from the GL headers. All the rest would
be prefixed or suffixed by _WINE so no risk of conflicts.

So even if the headers are ugly, I do not see how it could break things.

> i think you'll have many breakage :)

Well, if I do the following, I wonder how I could have breakages :-) :

#define GL_COMBINE_RGB_WINE0x8571

I.e. I do not plan to use ANY pre-defined values from the header but to
define them all myself.

So tell me where I could have breakage ?

> As you want,
> But for me, I think building with GL1.4 (last ans most complete) 
> headers and detecting/activing caps on runtime it's a more proper 
> solution (no more #ifdef/#define in code, only in d3dcore_gl.h 
> definitions).

I cannot see how you can do this without shipping all the GL / GLX 1.4
headers with Wine itself.

If you plan to redefine stuff, this is exactly what I planned to do and you
told that it would introduce breakage :-)

 Lionel

-- 
 Lionel Ulmer - http://www.bbrox.org/

Re: Re: Submits galore

[Ann and Jason Edmeades]

>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)

>| 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"

This is exactly the problem I am having with patches beyond dx48

Any idea what patch Alexander is up to in cvs?

BTW Possibly a question for Alexander, but can we prefix the changelog with
eg [dx48] when we have long patch sequences, as its hard keeping track of
everything

Jason

Re: Submits galore

[Sylvain Petreolle]

Alexandre, welcome back and wtg :)

 --- Johan Gill <[EMAIL PROTECTED]> a écrit : 
> It seems Alexandre is back or just got tired of the patch storm :)
> D3D-lovers should update from CVS I'd say.
> 
> -- 
> Johan Gill, [EMAIL PROTECTED]
> 
>  

=
Sylvain Petreolle (spetreolle at users dot sourceforge dot net) 
ICQ #170597259
No more War !

"What if tomorrow the War could be over ?" Morpheus, in "Reloaded".

For the Law of Oil and Fire, Im an European that lives in France.
For all my Brothers and friends, Im a human living on Earth.

___
Do You Yahoo!? -- Une adresse @yahoo.fr gratuite et en français !
Yahoo! Mail : http://fr.mail.yahoo.com

Re: Re: Re: Submits galore

[fenix]

>> 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)

Hi All,

>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.

well, the problem is that gl.h defines ugly things too.
as i have reports from users using mesa headers 3.4 (openGL 1.2 
only declared but ugly pre 1.3 support) while using Mesa5.0 (very 
easy to do: install a XFree4.0 and after install only mesa5)

>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.

i think you'll have many breakage :)

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

As you want,
But for me, I think building with GL1.4 (last ans most complete) 
headers and detecting/activing caps on runtime it's a more proper 
solution (no more #ifdef/#define in code, only in d3dcore_gl.h 
definitions).

>Lionel

Regards,
Raphael

Re: Re: Submits galore

[fenix]

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
>[EMAIL PROTECTED]
>
>

Re: Submits galore

[Rein Klazes]

On Thu, 5 Jun 2003 13:11:11 +0200, you wrote:

> 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
[EMAIL PROTECTED]

Re: Re: 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

-- 
 Lionel Ulmer - http://www.bbrox.org/

Re: Submits galore

[fenix]

yes,
I have seen this "d3d commit fury" in realtime :)

Alexandre, you have done a very impressive job :)

But you returned too early as we haven't sent all our patches (i was too bored to do 
the cleaning stuff last week).

But we'll thanks all D3D-lovers that can report games ok, or with graphics problems.

Regards,
Raphael


Message d'origine
>De: Johan Gill <[EMAIL PROTECTED]>
>A: [EMAIL PROTECTED]
>Sujet: Submits galore
>Date: Thu, 5 Jun 2003 13:11:11 +0200
>
>It seems Alexandre is back or just got tired of the patch storm :) D3D-lovers should 
>update from CVS I'd say.
>
>-- 
>Johan Gill, [EMAIL PROTECTED]
>
>
>