[PATCH 0/1] MR326: include: Add the D3D_PRIMITIVE enum and the D3D12_PRIMITIVE typedef

[PATCH 1/1] include: Add the D3D_PRIMITIVE enum and the D3D12_PRIMITIVE typedef

[Martin Storsjö]

From: Martin Storsjö

Signed-off-by: Martin Storsjö 
---
 include/vkd3d_d3d12.idl     |  2 +
 include/vkd3d_d3dcommon.idl | 86 +++++++++++++++++++++++++++++++++++++
 2 files changed, 88 insertions(+)

diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl
index 8f9c226e4..71a749993 100644
--- a/include/vkd3d_d3d12.idl
+++ b/include/vkd3d_d3d12.idl
@@ -1599,6 +1599,8 @@ typedef enum D3D12_INDEX_BUFFER_STRIP_CUT_VALUE

typedef D3D_PRIMITIVE_TOPOLOGY D3D12_PRIMITIVE_TOPOLOGY;

+typedef D3D_PRIMITIVE D3D12_PRIMITIVE;
+
 typedef enum D3D12_PRIMITIVE_TOPOLOGY_TYPE
 {
     D3D12_PRIMITIVE_TOPOLOGY_TYPE_UNDEFINED = 0,
diff --git a/include/vkd3d_d3dcommon.idl b/include/vkd3d_d3dcommon.idl
index 0e0d4f7ba..b79486099 100644
--- a/include/vkd3d_d3dcommon.idl
+++ b/include/vkd3d_d3dcommon.idl
@@ -21,6 +21,92 @@ import "vkd3d_windows.h";

#include "vkd3d_unknown.idl"

+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,
+    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,
+    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 = 0,

[PATCH 0/1] MR326: include: Add the D3D_PRIMITIVE enum and the D3D12_PRIMITIVE typedef - approved

[Jacek Caban (＠jacek)]

This merge request was approved by Jacek Caban.

[PATCH 0/1] MR326: include: Add the D3D_PRIMITIVE enum and the D3D12_PRIMITIVE typedef - approved

[Henri Verbeet (＠hverbeet)]

This merge request was approved by Henri Verbeet.