* Made it possible to include both d3d9types.h and ddrawgdi.h at the same time

[reactos.git] / reactos / include / ddk / d3dhal.h

diff --git a/reactos/include/ddk/d3dhal.h b/reactos/include/ddk/d3dhal.h
index 867901a..325e186 100644 (file)
--- a/reactos/include/ddk/d3dhal.h
+++ b/reactos/include/ddk/d3dhal.h
@@ -28,6 +28,8 @@ extern "C" {
 
 #include <d3d.h>
 
+#define D3DERR_COMMAND_UNPARSED 0x88760BB8;
+
 /*****************************************************************************
  * device info structures
  */
@@ -57,7 +59,12 @@ typedef struct _D3DHAL_GLOBALDRIVERDATA {
   DWORD                        dwNumClipVertices;
   DWORD                        dwNumTextureFormats;
   LPDDSURFACEDESC      lpTextureFormats;
-} D3DHAL_GLOBALDRIVERDATA,*LPD3DHAL_GLOBALDRIVERDATA;
+} D3DHAL_GLOBALDRIVERDATA;
+
+#ifndef D3DHAL_GLOBALDRIVERDATA_DEFINED
+typedef D3DHAL_GLOBALDRIVERDATA *LPD3DHAL_GLOBALDRIVERDATA;
+#define D3DHAL_GLOBALDRIVERDATA_DEFINED
+#endif
 
 typedef struct _D3DHAL_D3DEXTENDEDCAPS {
   DWORD                        dwSize;
@@ -157,7 +164,12 @@ typedef struct _D3DHAL_CALLBACKS {
   DWORD                                dwReserved7;
   DWORD                                dwReserved8;
   DWORD                                dwReserved9;
-} D3DHAL_CALLBACKS,*LPD3DHAL_CALLBACKS;
+} D3DHAL_CALLBACKS;
+
+#ifndef D3DHAL_CALLBACKS_DEFINED
+typedef D3DHAL_CALLBACKS *LPD3DHAL_CALLBACKS;
+#define D3DHAL_CALLBACKS_DEFINED
+#endif
 
 typedef struct _D3DHAL_SETRENDERTARGETDATA             *LPD3DHAL_SETRENDERTARGETDATA;
 typedef struct _D3DHAL_CLEARDATA                       *LPD3DHAL_CLEARDATA;
@@ -302,7 +314,6 @@ typedef enum _D3DHAL_DP2OPERATION {
   D3DDP2OP_POINTS              = 1,
   D3DDP2OP_INDEXEDLINELIST     = 2,
   D3DDP2OP_INDEXEDTRIANGLELIST = 3,
-  D3DDP2OP_RESERVED0           = 4,
   D3DDP2OP_RENDERSTATE         = 8,
   D3DDP2OP_LINELIST            = 15,
   D3DDP2OP_LINESTRIP           = 16,
@@ -328,7 +339,6 @@ typedef enum _D3DHAL_DP2OPERATION {
   D3DDP2OP_SETLIGHT            = 34,
   D3DDP2OP_CREATELIGHT         = 35,
   D3DDP2OP_SETTRANSFORM                = 36,
-  D3DDP2OP_EXT                 = 37,
   D3DDP2OP_TEXBLT              = 38,
   D3DDP2OP_STATESET            = 39,
   D3DDP2OP_SETPRIORITY         = 40,
@@ -337,7 +347,58 @@ typedef enum _D3DHAL_DP2OPERATION {
   D3DDP2OP_CLEAR               = 42,
   /* DirectX 7 interfaces */
   D3DDP2OP_SETTEXLOD           = 43,
-  D3DPP2OP_SETCLIPPLANE                = 44
+  D3DPP2OP_SETCLIPPLANE                = 44,
+#if(DIRECT3D_VERSION >= 0x0800)
+  D3DDP2OP_CREATEVERTEXSHADER   = 45,
+  D3DDP2OP_DELETEVERTEXSHADER   = 46,
+  D3DDP2OP_SETVERTEXSHADER      = 47,
+  D3DDP2OP_SETVERTEXSHADERCONST = 48,
+  D3DDP2OP_SETSTREAMSOURCE      = 49,
+  D3DDP2OP_SETSTREAMSOURCEUM    = 50,
+  D3DDP2OP_SETINDICES           = 51,
+  D3DDP2OP_DRAWPRIMITIVE        = 52,
+  D3DDP2OP_DRAWINDEXEDPRIMITIVE = 53,
+  D3DDP2OP_CREATEPIXELSHADER    = 54,
+  D3DDP2OP_DELETEPIXELSHADER    = 55,
+  D3DDP2OP_SETPIXELSHADER       = 56,
+  D3DDP2OP_SETPIXELSHADERCONST  = 57,
+  D3DDP2OP_CLIPPEDTRIANGLEFAN   = 58,
+  D3DDP2OP_DRAWPRIMITIVE2       = 59,
+  D3DDP2OP_DRAWINDEXEDPRIMITIVE2= 60,
+  D3DDP2OP_DRAWRECTPATCH        = 61,
+  D3DDP2OP_DRAWTRIPATCH         = 62,
+  D3DDP2OP_VOLUMEBLT            = 63,
+  D3DDP2OP_BUFFERBLT            = 64,
+  D3DDP2OP_MULTIPLYTRANSFORM    = 65,
+  D3DDP2OP_ADDDIRTYRECT         = 66,
+  D3DDP2OP_ADDDIRTYBOX          = 67,
+#endif
+#if(DIRECT3D_VERSION >= 0x0900)
+  D3DDP2OP_CREATEVERTEXSHADERDECL   = 71,
+  D3DDP2OP_DELETEVERTEXSHADERDECL   = 72,
+  D3DDP2OP_SETVERTEXSHADERDECL      = 73,
+  D3DDP2OP_CREATEVERTEXSHADERFUNC   = 74,
+  D3DDP2OP_DELETEVERTEXSHADERFUNC   = 75,
+  D3DDP2OP_SETVERTEXSHADERFUNC      = 76,
+  D3DDP2OP_SETVERTEXSHADERCONSTI    = 77,
+  D3DDP2OP_SETSCISSORRECT           = 79,
+  D3DDP2OP_SETSTREAMSOURCE2         = 80,
+  D3DDP2OP_BLT                      = 81,
+  D3DDP2OP_COLORFILL                = 82,
+  D3DDP2OP_SETVERTEXSHADERCONSTB    = 83,
+  D3DDP2OP_CREATEQUERY              = 84,
+  D3DDP2OP_SETRENDERTARGET2         = 85,
+  D3DDP2OP_SETDEPTHSTENCIL          = 86,
+  D3DDP2OP_RESPONSECONTINUE         = 87,
+  D3DDP2OP_RESPONSEQUERY            = 88,
+  D3DDP2OP_GENERATEMIPSUBLEVELS     = 89,
+  D3DDP2OP_DELETEQUERY              = 90,
+  D3DDP2OP_ISSUEQUERY               = 91,
+  D3DDP2OP_SETPIXELSHADERCONSTI     = 93,
+  D3DDP2OP_SETPIXELSHADERCONSTB     = 94,
+  D3DDP2OP_SETSTREAMSOURCEFREQ      = 95,
+  D3DDP2OP_SURFACEBLT               = 96
+#endif
 } D3DHAL_DP2OPERATION;
 
 /* point primitives */