Ivan Gyurdiev : wined3d:
Merge D3DCOLOR types into one type in WINED3D namespace.
Alexandre Julliard
julliard at wine.codeweavers.com
Thu Oct 12 05:46:48 CDT 2006
Module: wine
Branch: master
Commit: 1cd7bcf4c87c3af90cc8ceff505c2f122f380ada
URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cd7bcf4c87c3af90cc8ceff505c2f122f380ada
Author: Ivan Gyurdiev <ivg231 at gmail.com>
Date: Thu Oct 12 02:22:59 2006 -0400
wined3d: Merge D3DCOLOR types into one type in WINED3D namespace.
---
dlls/wined3d/device.c | 4 ++--
include/wine/wined3d_interface.h | 4 ++--
include/wine/wined3d_types.h | 2 ++
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 4b72580..748dbef 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -6022,7 +6022,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl
}
static HRESULT WINAPI IWineD3DDeviceImpl_Clear(IWineD3DDevice *iface, DWORD Count, CONST WINED3DRECT* pRects,
- DWORD Flags, D3DCOLOR Color, float Z, DWORD Stencil) {
+ DWORD Flags, WINED3DCOLOR Color, float Z, DWORD Stencil) {
IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface;
/* TODO: From MSDN This method fails if you specify the D3DCLEAR_ZBUFFER or D3DCLEAR_STENCIL flags when the
@@ -6995,7 +6995,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl
return WINED3D_OK;
}
-static HRESULT WINAPI IWineD3DDeviceImpl_ColorFill(IWineD3DDevice *iface, IWineD3DSurface *pSurface, CONST WINED3DRECT* pRect, D3DCOLOR color) {
+static HRESULT WINAPI IWineD3DDeviceImpl_ColorFill(IWineD3DDevice *iface, IWineD3DSurface *pSurface, CONST WINED3DRECT* pRect, WINED3DCOLOR color) {
IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface;
IWineD3DSurfaceImpl *surface = (IWineD3DSurfaceImpl *) pSurface;
DDBLTFX BltFx;
diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h
index b6a2650..60c2334 100644
--- a/include/wine/wined3d_interface.h
+++ b/include/wine/wined3d_interface.h
@@ -447,7 +447,7 @@ DECLARE_INTERFACE_(IWineD3DDevice,IWineD
STDMETHOD(BeginScene)(THIS) PURE;
STDMETHOD(EndScene)(THIS) PURE;
STDMETHOD(Present)(THIS_ CONST RECT * pSourceRect,CONST RECT * pDestRect,HWND hDestWindowOverride,CONST RGNDATA * pDirtyRegion) PURE;
- STDMETHOD(Clear)(THIS_ DWORD Count, CONST WINED3DRECT * pRects, DWORD Flags, D3DCOLOR Color,float Z, DWORD Stencil) PURE;
+ STDMETHOD(Clear)(THIS_ DWORD Count, CONST WINED3DRECT * pRects, DWORD Flags, WINED3DCOLOR Color, float Z, DWORD Stencil) PURE;
STDMETHOD(DrawPrimitive)(THIS_ D3DPRIMITIVETYPE PrimitiveType,UINT StartVertex,UINT PrimitiveCount) PURE;
STDMETHOD(DrawIndexedPrimitive)(THIS_ D3DPRIMITIVETYPE PrimitiveType,INT baseVIdx, UINT minIndex,UINT NumVertices,UINT startIndex,UINT primCount) PURE;
STDMETHOD(DrawPrimitiveUP)(THIS_ D3DPRIMITIVETYPE PrimitiveType,UINT PrimitiveCount,CONST void * pVertexStreamZeroData,UINT VertexStreamZeroStride) PURE;
@@ -456,7 +456,7 @@ DECLARE_INTERFACE_(IWineD3DDevice,IWineD
STDMETHOD(DrawRectPatch)(THIS_ UINT Handle, CONST float* pNumSegs, CONST WINED3DRECTPATCH_INFO* pRectPatchInfo) PURE;
STDMETHOD(DrawTriPatch)(THIS_ UINT Handle, CONST float* pNumSegs, CONST WINED3DTRIPATCH_INFO* pTriPatchInfo) PURE;
STDMETHOD(DeletePatch)(THIS_ UINT Handle) PURE;
- STDMETHOD(ColorFill)(THIS_ struct IWineD3DSurface* pSurface, CONST WINED3DRECT* pRect, D3DCOLOR color) PURE;
+ STDMETHOD(ColorFill)(THIS_ struct IWineD3DSurface* pSurface, CONST WINED3DRECT* pRect, WINED3DCOLOR color) PURE;
STDMETHOD(UpdateTexture)(THIS_ struct IWineD3DBaseTexture *pSourceTexture, struct IWineD3DBaseTexture *pDestinationTexture) PURE;
STDMETHOD(UpdateSurface)(THIS_ struct IWineD3DSurface* pSourceSurface, CONST RECT* pSourceRect, struct IWineD3DSurface* pDestinationSurface, CONST POINT* pDestPoint) PURE;
STDMETHOD(CopyRects)(THIS_ struct IWineD3DSurface* pSourceSurface, CONST RECT* pSourceRectsArray, UINT cRects, struct IWineD3DSurface* pDestinationSurface, CONST POINT* pDestPointsArray);
diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h
index 9eac171..b930211 100644
--- a/include/wine/wined3d_types.h
+++ b/include/wine/wined3d_types.h
@@ -30,6 +30,8 @@ #if !defined( __WINE_D3D_H ) && !defined
# error You must include d3d.h, d3d8.h or d3d9.h header to use this header
#endif
+typedef DWORD WINED3DCOLOR;
+
typedef enum _WINED3DLIGHTTYPE {
WINED3DLIGHT_POINT = 1,
WINED3DLIGHT_SPOT = 2,
More information about the wine-cvs
mailing list