Rico Schüller : include: Move D3D_PRIMITIVE to d3dcommon.h.

[Alexandre Julliard]

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

Author: Rico Schüller <kgbricola at web.de>
Date:   Wed Oct 27 21:33:44 2010 +0200

include: Move D3D_PRIMITIVE to d3dcommon.h.

---

 include/d3d10.idl     |    2 +
 include/d3d11.idl     |    2 +
 include/d3dcommon.idl |   86 +++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 90 insertions(+), 0 deletions(-)

diff --git a/include/d3d10.idl b/include/d3d10.idl
index ddde923..57e8049 100644
--- a/include/d3d10.idl
+++ b/include/d3d10.idl
@@ -753,6 +753,8 @@ typedef struct D3D10_QUERY_DESC {
 
 typedef D3D_PRIMITIVE_TOPOLOGY D3D10_PRIMITIVE_TOPOLOGY;
 
+typedef D3D_PRIMITIVE D3D10_PRIMITIVE;
+
 typedef RECT D3D10_RECT;
 
 typedef struct D3D10_VIEWPORT {
diff --git a/include/d3d11.idl b/include/d3d11.idl
index f0c35a2..5959010 100644
--- a/include/d3d11.idl
+++ b/include/d3d11.idl
@@ -23,4 +23,6 @@ import "d3dcommon.idl";
 
 typedef D3D_SRV_DIMENSION D3D11_SRV_DIMENSION;
 
+typedef D3D_PRIMITIVE D3D11_PRIMITIVE;
+
 typedef D3D_PRIMITIVE_TOPOLOGY D3D11_PRIMITIVE_TOPOLOGY;
diff --git a/include/d3dcommon.idl b/include/d3dcommon.idl
index 2232bde..24649a7 100644
--- a/include/d3dcommon.idl
+++ b/include/d3dcommon.idl
@@ -198,6 +198,92 @@ typedef enum _D3D_SHADER_VARIABLE_TYPE
     D3D_SVT_FORCE_DWORD = 0x7fffffff,
 } D3D_SHADER_VARIABLE_TYPE;
 
+typedef enum D3D_PRIMITIVE
+{
+    D3D_PRIMITIVE_UNDEFINED,
+    D3D_PRIMITIVE_POINT,
+    D3D_PRIMITIVE_LINE,
+    D3D_PRIMITIVE_TRIANGLE,
+    D3D_PRIMITIVE_LINE_ADJ = 6,
+    D3D_PRIMITIVE_TRIANGLE_ADJ,
+    D3D_PRIMITIVE_1_CONTROL_POINT_PATCH,
+    D3D_PRIMITIVE_2_CONTROL_POINT_PATCH,
+    D3D_PRIMITIVE_3_CONTROL_POINT_PATCH,
+    D3D_PRIMITIVE_4_CONTROL_POINT_PATCH,
+    D3D_PRIMITIVE_5_CONTROL_POINT_PATCH,
+    D3D_PRIMITIVE_6_CONTROL_POINT_PATCH,
+    D3D_PRIMITIVE_7_CONTROL_POINT_PATCH,
+    D3D_PRIMITIVE_8_CONTROL_POINT_PATCH,
+    D3D_PRIMITIVE_9_CONTROL_POINT_PATCH,
+    D3D_PRIMITIVE_10_CONTROL_POINT_PATCH,
+    D3D_PRIMITIVE_11_CONTROL_POINT_PATCH,
+    D3D_PRIMITIVE_12_CONTROL_POINT_PATCH,
+    D3D_PRIMITIVE_13_CONTROL_POINT_PATCH,
+    D3D_PRIMITIVE_14_CONTROL_POINT_PATCH,
+    D3D_PRIMITIVE_15_CONTROL_POINT_PATCH,
+    D3D_PRIMITIVE_16_CONTROL_POINT_PATCH,
+    D3D_PRIMITIVE_17_CONTROL_POINT_PATCH,
+    D3D_PRIMITIVE_18_CONTROL_POINT_PATCH,
+    D3D_PRIMITIVE_19_CONTROL_POINT_PATCH,
+    D3D_PRIMITIVE_20_CONTROL_POINT_PATCH = 28,
+    D3D_PRIMITIVE_21_CONTROL_POINT_PATCH,
+    D3D_PRIMITIVE_22_CONTROL_POINT_PATCH,
+    D3D_PRIMITIVE_23_CONTROL_POINT_PATCH,
+    D3D_PRIMITIVE_24_CONTROL_POINT_PATCH,
+    D3D_PRIMITIVE_25_CONTROL_POINT_PATCH,
+    D3D_PRIMITIVE_26_CONTROL_POINT_PATCH,
+    D3D_PRIMITIVE_27_CONTROL_POINT_PATCH,
+    D3D_PRIMITIVE_28_CONTROL_POINT_PATCH,
+    D3D_PRIMITIVE_29_CONTROL_POINT_PATCH,
+    D3D_PRIMITIVE_30_CONTROL_POINT_PATCH,
+    D3D_PRIMITIVE_31_CONTROL_POINT_PATCH,
+    D3D_PRIMITIVE_32_CONTROL_POINT_PATCH,
+    D3D10_PRIMITIVE_UNDEFINED = 0,
+    D3D10_PRIMITIVE_POINT,
+    D3D10_PRIMITIVE_LINE,
+    D3D10_PRIMITIVE_TRIANGLE,
+    D3D10_PRIMITIVE_LINE_ADJ = 6,
+    D3D10_PRIMITIVE_TRIANGLE_ADJ,
+    D3D11_PRIMITIVE_UNDEFINED = 0,
+    D3D11_PRIMITIVE_POINT,
+    D3D11_PRIMITIVE_LINE,
+    D3D11_PRIMITIVE_TRIANGLE,
+    D3D11_PRIMITIVE_LINE_ADJ = 6,
+    D3D11_PRIMITIVE_TRIANGLE_ADJ,
+    D3D11_PRIMITIVE_1_CONTROL_POINT_PATCH,
+    D3D11_PRIMITIVE_2_CONTROL_POINT_PATCH,
+    D3D11_PRIMITIVE_3_CONTROL_POINT_PATCH,
+    D3D11_PRIMITIVE_4_CONTROL_POINT_PATCH,
+    D3D11_PRIMITIVE_5_CONTROL_POINT_PATCH,
+    D3D11_PRIMITIVE_6_CONTROL_POINT_PATCH,
+    D3D11_PRIMITIVE_7_CONTROL_POINT_PATCH,
+    D3D11_PRIMITIVE_8_CONTROL_POINT_PATCH,
+    D3D11_PRIMITIVE_9_CONTROL_POINT_PATCH,
+    D3D11_PRIMITIVE_10_CONTROL_POINT_PATCH,
+    D3D11_PRIMITIVE_11_CONTROL_POINT_PATCH,
+    D3D11_PRIMITIVE_12_CONTROL_POINT_PATCH,
+    D3D11_PRIMITIVE_13_CONTROL_POINT_PATCH,
+    D3D11_PRIMITIVE_14_CONTROL_POINT_PATCH,
+    D3D11_PRIMITIVE_15_CONTROL_POINT_PATCH,
+    D3D11_PRIMITIVE_16_CONTROL_POINT_PATCH,
+    D3D11_PRIMITIVE_17_CONTROL_POINT_PATCH,
+    D3D11_PRIMITIVE_18_CONTROL_POINT_PATCH,
+    D3D11_PRIMITIVE_19_CONTROL_POINT_PATCH,
+    D3D11_PRIMITIVE_20_CONTROL_POINT_PATCH = 28,
+    D3D11_PRIMITIVE_21_CONTROL_POINT_PATCH,
+    D3D11_PRIMITIVE_22_CONTROL_POINT_PATCH,
+    D3D11_PRIMITIVE_23_CONTROL_POINT_PATCH,
+    D3D11_PRIMITIVE_24_CONTROL_POINT_PATCH,
+    D3D11_PRIMITIVE_25_CONTROL_POINT_PATCH,
+    D3D11_PRIMITIVE_26_CONTROL_POINT_PATCH,
+    D3D11_PRIMITIVE_27_CONTROL_POINT_PATCH,
+    D3D11_PRIMITIVE_28_CONTROL_POINT_PATCH,
+    D3D11_PRIMITIVE_29_CONTROL_POINT_PATCH,
+    D3D11_PRIMITIVE_30_CONTROL_POINT_PATCH,
+    D3D11_PRIMITIVE_31_CONTROL_POINT_PATCH,
+    D3D11_PRIMITIVE_32_CONTROL_POINT_PATCH,
+} D3D_PRIMITIVE;
+
 typedef enum D3D_PRIMITIVE_TOPOLOGY
 {
     D3D_PRIMITIVE_TOPOLOGY_UNDEFINED,