Gerald Pfeifer : include: Move WINED3DTS_WORLD et al directly into _WINED3DTRANSFORMSTATETYPE.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: feecb8ebaf3ea57e07a770170ee183fb03a82b55
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=feecb8ebaf3ea57e07a770170e...

Author: Gerald Pfeifer 
Date:   Sun Jan  3 19:45:41 2010 +0100

include: Move WINED3DTS_WORLD et al directly into _WINED3DTRANSFORMSTATETYPE.

---

include/wine/wined3d.idl |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl
index c91437a..6364f9c 100644
--- a/include/wine/wined3d.idl
+++ b/include/wine/wined3d.idl
@@ -716,12 +716,12 @@ typedef enum _WINED3DTRANSFORMSTATETYPE
     WINED3DTS_TEXTURE5                      = 21,
     WINED3DTS_TEXTURE6                      = 22,
     WINED3DTS_TEXTURE7                      = 23,
+    WINED3DTS_WORLD                         = 256, /*WINED3DTS_WORLDMATRIX(0)*/
+    WINED3DTS_WORLD1                        = 257,
+    WINED3DTS_WORLD2                        = 258,
+    WINED3DTS_WORLD3                        = 259,
     WINED3DTS_FORCE_DWORD                   = 0x7fffffff
 } WINED3DTRANSFORMSTATETYPE;
-cpp_quote("#define WINED3DTS_WORLD  WINED3DTS_WORLDMATRIX(0)")
-cpp_quote("#define WINED3DTS_WORLD1 WINED3DTS_WORLDMATRIX(1)")
-cpp_quote("#define WINED3DTS_WORLD2 WINED3DTS_WORLDMATRIX(2)")
-cpp_quote("#define WINED3DTS_WORLD3 WINED3DTS_WORLDMATRIX(3)")
 cpp_quote("#define WINED3DTS_WORLDMATRIX(index) (WINED3DTRANSFORMSTATETYPE)(index + 256)")

typedef enum _WINED3DBASISTYPE