[dx8 patch 12]: huge cleanup + split

[Andrew John Hughes]

On Sat, 25 Jan 2003 01:14:15 +0100
Raphaël Junqueira <fenix at club-internet.fr> wrote:

> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> Hi all,
>  it seems a big patch, but it's only simple cleanups/splits ;)
> 
>  it's the first and bigger patch for splitting d3d8 from the future d3d7/d3d8/d3d9 comon code 
> 
>  Changelog:
>    - some needed cleanups for future dx9 and d3d common layer support:
>      - stateblocks to IDirect3DStateBlockImpl interface and moving into a new file (stateblock.c)
>      - shaders to IDirect3D*ShaderImpl interfaces
>      - splitting vshader and vshader declaration as in dx9 into 2 interfaces (for future common layer use)
>      - vshader declaration code to a new file (vsaderdeclaration.c)
>      - device calls to new interfaces (redirect stubs)
>    - simple texture fix for a little regression after last jason patches
>    - some caps code using the GL/glext.h defines (GL_VERSION_*)
>   
>   Todo:
>    - renaming IDirec3DDevice8Impl::StateBlock to IDirec3DDevice8Impl::startupStateBlock
>    - moving IDirec3DDevice8Impl d3d generic code to a "common layer" interface (maybe IDirec3DDeviceImpl)
>    - merging new DrawPrimitive prototype (using ddraw code) with current code
>    - splitting d3d8_private.h into 2 headers (d3d8 specific header, and common layer header)
>    - merging the hal base prototype
> 
> Raphael
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.2.1 (GNU/Linux)
> 
> iD8DBQE+MdbYp7NA3AmQTU4RAg3DAJ94zf6kzopk2WH95+Nvq/BcH26dogCdEhf2
> UASOhtqMDLoJocMODUtZZv8=
> =5SNm
> -----END PGP SIGNATURE-----
> 
Including glext.h appears to break the DLL for me.  NVidia's GL headers (gl.h) already define some of the
types specified in glext.h.  I presume X installs glext.h, but I've not had a conflict between the two headers
before.

In file included from d3d8_private.h:30,
                 from device.c:35:
/usr/local/include/GL/glext.h:3142: conflicting types for `glCopyTexSubImage3DEXT'
/usr/local/include/GL/gl.h:2486: previous declaration of `glCopyTexSubImage3DEXT'
/usr/local/include/GL/glext.h:3566: conflicting types for `glColorSubTableEXT'
/usr/local/include/GL/gl.h:2446: previous declaration of `glColorSubTableEXT'
/usr/local/include/GL/glext.h:4372: conflicting types for `glTbufferMask3DFX'
/usr/local/include/GL/gl.h:2984: previous declaration of `glTbufferMask3DFX'
/usr/local/include/GL/glext.h:4406: conflicting types for `glTextureColorMaskSGIS'
/usr/local/include/GL/gl.h:3050: previous declaration of `glTextureColorMaskSGIS'

-- 
Andrew :-)

Please avoid sending me Word or PowerPoint attachments.
See http://www.fsf.org/philosophy/no-word-attachments.html

"Windows is the one true OS. MS invented the GUI. MS invented 
   the 32 bit OS. MS is open and standard. MS loves you. We have 
   always been at war with Oceania." 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://www.winehq.org/pipermail/wine-devel/attachments/20030128/b490abdb/attachment.pgp