include: Move D3D_SRV_DIMENSION to d3dcommon.h.

.gitignore

@@ -161,6 +161,7 @@ include/ctfutb.h
 include/ctxtcall.h
 include/d3d10.h
 include/d3d10_1.h
+include/d3d11.h
 include/d3dcommon.h
 include/ddstream.h
 include/devicetopology.h

include/Makefile.in

@@ -21,6 +21,7 @@ PUBLIC_IDL_H_SRCS = \
 	ctxtcall.idl \
 	d3d10.idl \
 	d3d10_1.idl \
+	d3d11.idl \
 	d3dcommon.idl \
 	ddstream.idl \
 	devicetopology.idl \

include/d3d10.idl

@@ -631,18 +631,7 @@ typedef struct D3D10_RENDER_TARGET_VIEW_DESC {
     } DUMMYUNIONNAME;
 } D3D10_RENDER_TARGET_VIEW_DESC;
 
-typedef enum D3D10_SRV_DIMENSION {
-    D3D10_SRV_DIMENSION_UNKNOWN,
-    D3D10_SRV_DIMENSION_BUFFER,
-    D3D10_SRV_DIMENSION_TEXTURE1D,
-    D3D10_SRV_DIMENSION_TEXTURE1DARRAY,
-    D3D10_SRV_DIMENSION_TEXTURE2D,
-    D3D10_SRV_DIMENSION_TEXTURE2DARRAY,
-    D3D10_SRV_DIMENSION_TEXTURE2DMS,
-    D3D10_SRV_DIMENSION_TEXTURE2DMSARRAY,
-    D3D10_SRV_DIMENSION_TEXTURE3D,
-    D3D10_SRV_DIMENSION_TEXTURECUBE,
-} D3D10_SRV_DIMENSION;
+typedef D3D_SRV_DIMENSION D3D10_SRV_DIMENSION;
 
 typedef struct D3D10_BUFFER_SRV {
     UINT ElementOffset;

include/d3d10_1.idl

@@ -68,20 +68,7 @@ typedef struct D3D10_TEXCUBE_ARRAY_SRV1
     UINT NumCubes;
 } D3D10_TEXCUBE_ARRAY_SRV1;
 
-typedef enum D3D10_SRV_DIMENSION1
-{
-    D3D10_1_SRV_DIMENSION_UNKNOWN           = 0,
-    D3D10_1_SRV_DIMENSION_BUFFER            = 1,
-    D3D10_1_SRV_DIMENSION_TEXTURE1D         = 2,
-    D3D10_1_SRV_DIMENSION_TEXTURE1DARRAY    = 3,
-    D3D10_1_SRV_DIMENSION_TEXTURE2D         = 4,
-    D3D10_1_SRV_DIMENSION_TEXTURE2DARRAY    = 5,
-    D3D10_1_SRV_DIMENSION_TEXTURE2DMS       = 6,
-    D3D10_1_SRV_DIMENSION_TEXTURE2DMSARRAY  = 7,
-    D3D10_1_SRV_DIMENSION_TEXTURE3D         = 8,
-    D3D10_1_SRV_DIMENSION_TEXTURECUBE       = 9,
-    D3D10_1_SRV_DIMENSION_TEXTURECUBEARRAY  = 10
-} D3D10_SRV_DIMENSION1;
+typedef D3D_SRV_DIMENSION D3D10_SRV_DIMENSION1;
 
 typedef struct D3D10_SHADER_RESOURCE_VIEW_DESC1
 {

include/d3d11.idl

+/*
+ * Copyright 2010 Rico Schüller
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+import "oaidl.idl";
+import "ocidl.idl";
+import "dxgi.idl";
+import "d3dcommon.idl";
+
+typedef D3D_SRV_DIMENSION D3D11_SRV_DIMENSION;

include/d3dcommon.idl

@@ -102,3 +102,52 @@ typedef enum D3D_CBUFFER_TYPE
     D3D11_CT_INTERFACE_POINTERS,
     D3D11_CT_RESOURCE_BIND_INFO,
 } D3D_CBUFFER_TYPE;
+
+typedef enum D3D_SRV_DIMENSION
+{
+    D3D_SRV_DIMENSION_UNKNOWN,
+    D3D_SRV_DIMENSION_BUFFER,
+    D3D_SRV_DIMENSION_TEXTURE1D,
+    D3D_SRV_DIMENSION_TEXTURE1DARRAY,
+    D3D_SRV_DIMENSION_TEXTURE2D,
+    D3D_SRV_DIMENSION_TEXTURE2DARRAY,
+    D3D_SRV_DIMENSION_TEXTURE2DMS,
+    D3D_SRV_DIMENSION_TEXTURE2DMSARRAY,
+    D3D_SRV_DIMENSION_TEXTURE3D,
+    D3D_SRV_DIMENSION_TEXTURECUBE,
+    D3D_SRV_DIMENSION_TEXTURECUBEARRAY,
+    D3D_SRV_DIMENSION_BUFFEREX,
+    D3D10_SRV_DIMENSION_UNKNOWN = 0,
+    D3D10_SRV_DIMENSION_BUFFER,
+    D3D10_SRV_DIMENSION_TEXTURE1D,
+    D3D10_SRV_DIMENSION_TEXTURE1DARRAY,
+    D3D10_SRV_DIMENSION_TEXTURE2D,
+    D3D10_SRV_DIMENSION_TEXTURE2DARRAY,
+    D3D10_SRV_DIMENSION_TEXTURE2DMS,
+    D3D10_SRV_DIMENSION_TEXTURE2DMSARRAY,
+    D3D10_SRV_DIMENSION_TEXTURE3D,
+    D3D10_SRV_DIMENSION_TEXTURECUBE,
+    D3D10_1_SRV_DIMENSION_UNKNOWN = 0,
+    D3D10_1_SRV_DIMENSION_BUFFER,
+    D3D10_1_SRV_DIMENSION_TEXTURE1D,
+    D3D10_1_SRV_DIMENSION_TEXTURE1DARRAY,
+    D3D10_1_SRV_DIMENSION_TEXTURE2D,
+    D3D10_1_SRV_DIMENSION_TEXTURE2DARRAY,
+    D3D10_1_SRV_DIMENSION_TEXTURE2DMS,
+    D3D10_1_SRV_DIMENSION_TEXTURE2DMSARRAY,
+    D3D10_1_SRV_DIMENSION_TEXTURE3D,
+    D3D10_1_SRV_DIMENSION_TEXTURECUBE,
+    D3D10_1_SRV_DIMENSION_TEXTURECUBEARRAY,
+    D3D11_SRV_DIMENSION_UNKNOWN = 0,
+    D3D11_SRV_DIMENSION_BUFFER,
+    D3D11_SRV_DIMENSION_TEXTURE1D,
+    D3D11_SRV_DIMENSION_TEXTURE1DARRAY,
+    D3D11_SRV_DIMENSION_TEXTURE2D,
+    D3D11_SRV_DIMENSION_TEXTURE2DARRAY,
+    D3D11_SRV_DIMENSION_TEXTURE2DMS,
+    D3D11_SRV_DIMENSION_TEXTURE2DMSARRAY,
+    D3D11_SRV_DIMENSION_TEXTURE3D,
+    D3D11_SRV_DIMENSION_TEXTURECUBE,
+    D3D11_SRV_DIMENSION_TEXTURECUBEARRAY,
+    D3D11_SRV_DIMENSION_BUFFEREX,
+} D3D_SRV_DIMENSION;