Module: wine Branch: master Commit: ec782c2b9763db0b4fdf0ed910e3485df14ac8ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec782c2b9763db0b4fdf0ed910...
Author: Ivan Gyurdiev ivg231@gmail.com Date: Thu Oct 12 02:21:00 2006 -0400
wined3d: D3DTRANSFORMSTATETYPE: Consistently use in the WINED3D namespace.
---
dlls/ddraw/device.c | 18 ++++++++++++++++++ dlls/wined3d/device.c | 6 +++--- dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d_interface.h | 6 +++--- 4 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index beded32..c276a2e 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2583,6 +2583,12 @@ IDirect3DDeviceImpl_7_SetTransform(IDire if(TransformStateType == D3DTRANSFORMSTATE_WORLD) type = (D3DTRANSFORMSTATETYPE)(0 + 256);
+ /* FIXME: + Unhandled: D3DTRANSFORMSTATE_WORLD1 + Unhandled: D3DTRANSFORMSTATE_WORLD2 + Unhandled: D3DTRANSFORMSTATE_WORLD3 + */ + return IWineD3DDevice_SetTransform(This->wineD3DDevice, type, Matrix); @@ -2648,6 +2654,12 @@ IDirect3DDeviceImpl_7_GetTransform(IDire if(TransformStateType == D3DTRANSFORMSTATE_WORLD) type = (D3DTRANSFORMSTATETYPE)(0 + 256);
+ /* FIXME: + Unhandled: D3DTRANSFORMSTATE_WORLD1 + Unhandled: D3DTRANSFORMSTATE_WORLD2 + Unhandled: D3DTRANSFORMSTATE_WORLD3 + */ + return IWineD3DDevice_GetTransform(This->wineD3DDevice, type, Matrix); }
@@ -2708,6 +2720,12 @@ IDirect3DDeviceImpl_7_MultiplyTransform( if(TransformStateType == D3DTRANSFORMSTATE_WORLD) TransformStateType = (D3DTRANSFORMSTATETYPE)(0 + 256);
+ /* FIXME: + Unhandled: D3DTRANSFORMSTATE_WORLD1 + Unhandled: D3DTRANSFORMSTATE_WORLD2 + Unhandled: D3DTRANSFORMSTATE_WORLD3 + */ + return IWineD3DDevice_MultiplyTransform(This->wineD3DDevice, TransformStateType, D3DMatrix); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4640f7d..288e7a3 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2506,7 +2506,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl /***** * Get / Set & Multiply Transform *****/ -static HRESULT WINAPI IWineD3DDeviceImpl_SetTransform(IWineD3DDevice *iface, D3DTRANSFORMSTATETYPE d3dts, CONST D3DMATRIX* lpmatrix) { +static HRESULT WINAPI IWineD3DDeviceImpl_SetTransform(IWineD3DDevice *iface, WINED3DTRANSFORMSTATETYPE d3dts, CONST D3DMATRIX* lpmatrix) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface;
/* Most of this routine, comments included copied from ddraw tree initially: */ @@ -2610,14 +2610,14 @@ static HRESULT WINAPI IWineD3DDeviceIm return WINED3D_OK;
} -static HRESULT WINAPI IWineD3DDeviceImpl_GetTransform(IWineD3DDevice *iface, D3DTRANSFORMSTATETYPE State, D3DMATRIX* pMatrix) { +static HRESULT WINAPI IWineD3DDeviceImpl_GetTransform(IWineD3DDevice *iface, WINED3DTRANSFORMSTATETYPE State, D3DMATRIX* pMatrix) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; TRACE("(%p) : for Transform State %s\n", This, debug_d3dtstype(State)); memcpy(pMatrix, &This->stateBlock->transforms[State], sizeof(D3DMATRIX)); return WINED3D_OK; }
-static HRESULT WINAPI IWineD3DDeviceImpl_MultiplyTransform(IWineD3DDevice *iface, D3DTRANSFORMSTATETYPE State, CONST D3DMATRIX* pMatrix) { +static HRESULT WINAPI IWineD3DDeviceImpl_MultiplyTransform(IWineD3DDevice *iface, WINED3DTRANSFORMSTATETYPE State, CONST D3DMATRIX* pMatrix) { D3DMATRIX *mat = NULL; D3DMATRIX temp;
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0ef6ad9..4bc8863 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -220,7 +220,7 @@ #define MAX_STREAMS 16 /* Maximum poss See MaxStreams in MSDN under GetDeviceCaps */ /* Maximum number of constants provided to the shaders */ #define HIGHEST_TRANSFORMSTATE 512 - /* Highest value in D3DTRANSFORMSTATETYPE */ + /* Highest value in WINED3DTRANSFORMSTATETYPE */ #define MAX_CLIPPLANES D3DMAXUSERCLIPPLANES
#define MAX_PALETTES 256 diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index 86f5dec..8f6a3fd 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -425,8 +425,8 @@ DECLARE_INTERFACE_(IWineD3DDevice,IWineD STDMETHOD(GetTexture)(THIS_ DWORD Stage, struct IWineD3DBaseTexture** ppTexture) PURE; STDMETHOD(SetTextureStageState)(THIS_ DWORD Stage, WINED3DTEXTURESTAGESTATETYPE Type,DWORD Value) PURE; STDMETHOD(GetTextureStageState)(THIS_ DWORD Stage, WINED3DTEXTURESTAGESTATETYPE Type,DWORD *pValue) PURE; - STDMETHOD(SetTransform)(THIS_ D3DTRANSFORMSTATETYPE State,CONST D3DMATRIX * pMatrix) PURE; - STDMETHOD(GetTransform)(THIS_ D3DTRANSFORMSTATETYPE State,D3DMATRIX * pMatrix) PURE; + STDMETHOD(SetTransform)(THIS_ WINED3DTRANSFORMSTATETYPE State, CONST D3DMATRIX * pMatrix) PURE; + STDMETHOD(GetTransform)(THIS_ WINED3DTRANSFORMSTATETYPE State, D3DMATRIX * pMatrix) PURE; STDMETHOD(SetVertexDeclaration)(THIS_ struct IWineD3DVertexDeclaration* pDecl) PURE; STDMETHOD(GetVertexDeclaration)(THIS_ struct IWineD3DVertexDeclaration** ppDecl) PURE; STDMETHOD(SetVertexShader)(THIS_ struct IWineD3DVertexShader* pShader) PURE; @@ -439,7 +439,7 @@ DECLARE_INTERFACE_(IWineD3DDevice,IWineD STDMETHOD(GetVertexShaderConstantF)(THIS_ UINT StartRegister, float* pConstantData, UINT Vector4fCount) PURE; STDMETHOD(SetViewport)(THIS_ CONST WINED3DVIEWPORT * pViewport) PURE; STDMETHOD(GetViewport)(THIS_ WINED3DVIEWPORT * pViewport) PURE; - STDMETHOD(MultiplyTransform)(THIS_ D3DTRANSFORMSTATETYPE State, CONST D3DMATRIX * pMatrix) PURE; + STDMETHOD(MultiplyTransform)(THIS_ WINED3DTRANSFORMSTATETYPE State, CONST D3DMATRIX * pMatrix) PURE; STDMETHOD(ValidateDevice)(THIS_ DWORD* pNumPasses) PURE; STDMETHOD(ProcessVertices)(THIS_ UINT SrcStartIndex, UINT DestIndex, UINT VertexCount, struct IWineD3DVertexBuffer* pDestBuffer, struct IWineD3DVertexBuffer* pVertexDecl, DWORD Flags) PURE; STDMETHOD(BeginStateBlock)(THIS) PURE;