Hello,
On Wed, Jan 19, 2005 at 01:34:49PM -0600, Alexandre Julliard wrote:
> ChangeSet ID: 15555
> CVSROOT: /opt/cvs-commit
> Module name: wine
> Changes by: [EMAIL PROTECTED] 2005/01/19 13:34:49
>
> Modified files:
> include/wine : wined3d_interface.h
> dlls/wined3d : wined3d_private.h Makefile.in
> Added files:
> dlls/wined3d : vertexdeclaration.c
>
> Log message:
> Raphael Junqueira <[EMAIL PROTECTED]>
> Begin support of VertexDeclaration on wined3d using d3d8 code base
> (handling d3d8 and d3d9 specs).
This patch broke the compilation of dlls/d3d8/basetexture.c
In file included from /home/michi/work/wine/dlls/d3d8/d3d8_private.h:69,
from /home/michi/work/wine/dlls/d3d8/basetexture.c:31:
/home/michi/work/wine/include/wine/wined3d_interface.h:877: error:
syntax error before "D3DVERTEXELEMENT9"
D3DVERTEXELEMENT9 isn't defined in D3D8 and trying to include any D3D9
header was futil, introduced more problems that it solved.
Attached is a quick hack to make it compile again.
bye
michael
>
> Patch: http://cvs.winehq.org/patch.py?id=15555
>
> Old revision New revision Changes Path
> 1.23 1.24 +38 -9 wine/include/wine/wined3d_interface.h
> 1.22 1.23 +29 -18 wine/dlls/wined3d/wined3d_private.h
> 1.12 1.13 +1 -0 wine/dlls/wined3d/Makefile.in
> Added 1.1 +0 -0 wine/dlls/wined3d/vertexdeclaration.c
>
>
--
Michael Stefaniuc Tel.: +49-711-96437-199
System Administration Fax.: +49-711-96437-111
Red Hat GmbH Email: [EMAIL PROTECTED]
Hauptstaetterstr. 58 http://www.redhat.de/
D-70178 Stuttgart
Index: include/wine/wined3d_interface.h
===================================================================
RCS file: /home/cvs/wine/include/wine/wined3d_interface.h,v
retrieving revision 1.24
diff -u -p -r1.24 wined3d_interface.h
--- include/wine/wined3d_interface.h 19 Jan 2005 19:34:49 -0000 1.24
+++ include/wine/wined3d_interface.h 19 Jan 2005 20:22:28 -0000
@@ -874,7 +874,9 @@ DECLARE_INTERFACE_(IWineD3DVertexDeclara
/*** IWineD3DVertexDeclaration methods ***/
STDMETHOD(GetDevice)(THIS_ IWineD3DDevice ** ppDevice) PURE;
STDMETHOD(GetDeclaration8)(THIS_ DWORD*, DWORD* pSizeOfData) PURE;
+#ifdef __WINE_D3D9_H
STDMETHOD(GetDeclaration9)(THIS_ D3DVERTEXELEMENT9*, UINT* pNumElements)
PURE;
+#endif
};
#undef INTERFACE
pgp6IPJafjdEy.pgp
Description: PGP signature
