Józef Kucia : include: Move D3D_PRIMITIVE_TOPOLOGY to d3dcommon.

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: 4c35737940c0487a358160355a2192dea29d8d6d
URL:    https://source.winehq.org/git/vkd3d.git/?a=commit;h=4c35737940c0487a35816035...

Author: Józef Kucia <jkucia(a)codeweavers.com>
Date:   Thu Feb 15 15:43:50 2018 +0100

include: Move D3D_PRIMITIVE_TOPOLOGY to d3dcommon.

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 include/vkd3d_d3d12.idl     | 10 ----------
 include/vkd3d_d3dcommon.idl | 10 ++++++++++
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl
index 2ccfa22..5bfc767 100644
--- a/include/vkd3d_d3d12.idl
+++ b/include/vkd3d_d3d12.idl
@@ -66,16 +66,6 @@ const UINT D3D12_SHADER_COMPONENT_MAPPING_SHIFT = 3;
 const UINT D3D12_SHADER_COMPONENT_MAPPING_ALWAYS_SET_BIT_AVOIDING_ZEROMEM_MISTAKES
         = 1 << (D3D12_SHADER_COMPONENT_MAPPING_SHIFT * 4);
 
-typedef enum D3D_PRIMITIVE_TOPOLOGY
-{
-    D3D_PRIMITIVE_TOPOLOGY_UNDEFINED = 0,
-    D3D_PRIMITIVE_TOPOLOGY_POINTLIST = 1,
-    D3D_PRIMITIVE_TOPOLOGY_LINELIST = 2,
-    D3D_PRIMITIVE_TOPOLOGY_LINESTRIP = 3,
-    D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST = 4,
-    D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP = 5,
-} D3D_PRIMITIVE_TOPOLOGY;
-
 typedef enum D3D12_SHADER_MIN_PRECISION_SUPPORT
 {
     D3D12_SHADER_MIN_PRECISION_SUPPORT_NONE = 0x0,
diff --git a/include/vkd3d_d3dcommon.idl b/include/vkd3d_d3dcommon.idl
index 1ddfce3..a874b6c 100644
--- a/include/vkd3d_d3dcommon.idl
+++ b/include/vkd3d_d3dcommon.idl
@@ -20,6 +20,16 @@ import "vkd3d_windows.h";
 
 #include "vkd3d_unknown.idl"
 
+typedef enum D3D_PRIMITIVE_TOPOLOGY
+{
+    D3D_PRIMITIVE_TOPOLOGY_UNDEFINED = 0,
+    D3D_PRIMITIVE_TOPOLOGY_POINTLIST = 1,
+    D3D_PRIMITIVE_TOPOLOGY_LINELIST = 2,
+    D3D_PRIMITIVE_TOPOLOGY_LINESTRIP = 3,
+    D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST = 4,
+    D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP = 5,
+} D3D_PRIMITIVE_TOPOLOGY;
+
 typedef enum D3D_FEATURE_LEVEL
 {
     D3D_FEATURE_LEVEL_9_1 = 0x9100,