commit ec782c2b9763db0b4fdf0ed910e3485df14ac8ac
author Ivan Gyurdiev <ivg231@gmail.com> Thu Oct 12 02:21:00 2006 -0400
committer Alexandre Julliard <julliard@winehq.org> Thu Oct 12 12:33:39 2006 +0200
tree 6fc289144031e517167392b31b2234f7a911d75e
parent b1a4bd87a9da1293e58f179b3528fd24dc80b3ca

wined3d: D3DTRANSFORMSTATETYPE: Consistently use in the WINED3D namespace.

dlls/ddraw/device.c

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

dlls/wined3d/device.c

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 @@
 /*****
  * 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 @@
     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;
 

dlls/wined3d/wined3d_private.h

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