[PATCH vkd3d 2/5] vkd3d-shader: Rename the vkd3d_tessellator_output_primitive enumeration.

[Henri Verbeet]

To vkd3d_shader_tessellator_output_primitive, consistent with vkd3d-shader
naming conventions.

Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
---
 include/vkd3d_shader.h                   | 14 ++++++++------
 libs/vkd3d-shader/spirv.c                | 10 +++++-----
 libs/vkd3d-shader/trace.c                | 10 +++++-----
 libs/vkd3d-shader/vkd3d_shader_private.h |  2 +-
 4 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h
index 7b3494e..66793dc 100644
--- a/include/vkd3d_shader.h
+++ b/include/vkd3d_shader.h
@@ -292,12 +292,14 @@ struct vkd3d_shader_spirv_target_info
     unsigned int output_swizzle_count;
 };
 
-enum vkd3d_tessellator_output_primitive
+enum vkd3d_shader_tessellator_output_primitive
 {
-    VKD3D_TESSELLATOR_OUTPUT_POINT        = 1,
-    VKD3D_TESSELLATOR_OUTPUT_LINE         = 2,
-    VKD3D_TESSELLATOR_OUTPUT_TRIANGLE_CW  = 3,
-    VKD3D_TESSELLATOR_OUTPUT_TRIANGLE_CCW = 4,
+    VKD3D_SHADER_TESSELLATOR_OUTPUT_POINT        = 0x1,
+    VKD3D_SHADER_TESSELLATOR_OUTPUT_LINE         = 0x2,
+    VKD3D_SHADER_TESSELLATOR_OUTPUT_TRIANGLE_CW  = 0x3,
+    VKD3D_SHADER_TESSELLATOR_OUTPUT_TRIANGLE_CCW = 0x4,
+
+    VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_TESSELLATOR_OUTPUT_PRIMITIVE),
 };
 
 enum vkd3d_tessellator_partitioning
@@ -314,7 +316,7 @@ struct vkd3d_shader_spirv_domain_shader_target_info
     enum vkd3d_shader_structure_type type;
     const void *next;
 
-    enum vkd3d_tessellator_output_primitive output_primitive;
+    enum vkd3d_shader_tessellator_output_primitive output_primitive;
     enum vkd3d_tessellator_partitioning partitioning;
 };
 
diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c
index 9b655e4..7c8ddab 100644
--- a/libs/vkd3d-shader/spirv.c
+++ b/libs/vkd3d-shader/spirv.c
@@ -5623,7 +5623,7 @@ static void vkd3d_dxbc_compiler_emit_dcl_tessellator_domain(struct vkd3d_dxbc_co
 }
 
 static void vkd3d_dxbc_compiler_emit_tessellator_output_primitive(struct vkd3d_dxbc_compiler *compiler,
-        enum vkd3d_tessellator_output_primitive primitive)
+        enum vkd3d_shader_tessellator_output_primitive primitive)
 {
     SpvExecutionMode mode;
 
@@ -5632,15 +5632,15 @@ static void vkd3d_dxbc_compiler_emit_tessellator_output_primitive(struct vkd3d_d
 
     switch (primitive)
     {
-        case VKD3D_TESSELLATOR_OUTPUT_POINT:
+        case VKD3D_SHADER_TESSELLATOR_OUTPUT_POINT:
             mode = SpvExecutionModePointMode;
             break;
-        case VKD3D_TESSELLATOR_OUTPUT_LINE:
+        case VKD3D_SHADER_TESSELLATOR_OUTPUT_LINE:
             return;
-        case VKD3D_TESSELLATOR_OUTPUT_TRIANGLE_CW:
+        case VKD3D_SHADER_TESSELLATOR_OUTPUT_TRIANGLE_CW:
             mode = SpvExecutionModeVertexOrderCw;
             break;
-        case VKD3D_TESSELLATOR_OUTPUT_TRIANGLE_CCW:
+        case VKD3D_SHADER_TESSELLATOR_OUTPUT_TRIANGLE_CCW:
             mode = SpvExecutionModeVertexOrderCcw;
             break;
         default:
diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c
index 279ede0..ee9b45c 100644
--- a/libs/vkd3d-shader/trace.c
+++ b/libs/vkd3d-shader/trace.c
@@ -501,20 +501,20 @@ static void shader_dump_tessellator_domain(struct vkd3d_string_buffer *buffer,
 }
 
 static void shader_dump_tessellator_output_primitive(struct vkd3d_string_buffer *buffer,
-        enum vkd3d_tessellator_output_primitive output_primitive)
+        enum vkd3d_shader_tessellator_output_primitive output_primitive)
 {
     switch (output_primitive)
     {
-        case VKD3D_TESSELLATOR_OUTPUT_POINT:
+        case VKD3D_SHADER_TESSELLATOR_OUTPUT_POINT:
             shader_addline(buffer, "point");
             break;
-        case VKD3D_TESSELLATOR_OUTPUT_LINE:
+        case VKD3D_SHADER_TESSELLATOR_OUTPUT_LINE:
             shader_addline(buffer, "line");
             break;
-        case VKD3D_TESSELLATOR_OUTPUT_TRIANGLE_CW:
+        case VKD3D_SHADER_TESSELLATOR_OUTPUT_TRIANGLE_CW:
             shader_addline(buffer, "triangle_cw");
             break;
-        case VKD3D_TESSELLATOR_OUTPUT_TRIANGLE_CCW:
+        case VKD3D_SHADER_TESSELLATOR_OUTPUT_TRIANGLE_CCW:
             shader_addline(buffer, "triangle_ccw");
             break;
         default:
diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h
index ecfd665..c8734ef 100644
--- a/libs/vkd3d-shader/vkd3d_shader_private.h
+++ b/libs/vkd3d-shader/vkd3d_shader_private.h
@@ -773,7 +773,7 @@ struct vkd3d_shader_instruction
         struct vkd3d_shader_tgsm_structured tgsm_structured;
         struct vkd3d_shader_thread_group_size thread_group_size;
         enum vkd3d_tessellator_domain tessellator_domain;
-        enum vkd3d_tessellator_output_primitive tessellator_output_primitive;
+        enum vkd3d_shader_tessellator_output_primitive tessellator_output_primitive;
         enum vkd3d_tessellator_partitioning tessellator_partitioning;
         float max_tessellation_factor;
         struct vkd3d_shader_index_range index_range;
-- 
2.11.0