[PATCH vkd3d 2/5] vkd3d-shader: Rename the vkd3d_shader_domain_shader_compile_arguments structure.

[Henri Verbeet]

To vkd3d_shader_spirv_domain_shader_target_info.

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

diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h
index 2b07906..1f58ebd 100644
--- a/include/vkd3d_shader.h
+++ b/include/vkd3d_shader.h
@@ -32,9 +32,9 @@ enum vkd3d_shader_structure_type
     /* 1.2 */
     VKD3D_SHADER_STRUCTURE_TYPE_SHADER_INTERFACE_INFO,
     VKD3D_SHADER_STRUCTURE_TYPE_SCAN_INFO,
+    VKD3D_SHADER_STRUCTURE_TYPE_SPIRV_DOMAIN_SHADER_TARGET_INFO,
     VKD3D_SHADER_STRUCTURE_TYPE_SPIRV_TARGET_INFO,
     VKD3D_SHADER_STRUCTURE_TYPE_TRANSFORM_FEEDBACK_INFO,
-    VKD3D_SHADER_STRUCTURE_TYPE_DOMAIN_SHADER_COMPILE_ARGUMENTS,
 
     VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_STRUCTURE_TYPE),
 };
@@ -269,7 +269,7 @@ enum vkd3d_tessellator_partitioning
 };
 
 /* Extends vkd3d_shader_spirv_target_info. */
-struct vkd3d_shader_domain_shader_compile_arguments
+struct vkd3d_shader_spirv_domain_shader_target_info
 {
     enum vkd3d_shader_structure_type type;
     const void *next;
diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c
index 31dcc4f..9bcb59d 100644
--- a/libs/vkd3d-shader/spirv.c
+++ b/libs/vkd3d-shader/spirv.c
@@ -8671,7 +8671,7 @@ int vkd3d_dxbc_compiler_generate_spirv(struct vkd3d_dxbc_compiler *compiler,
         struct vkd3d_shader_code *spirv)
 {
     const struct vkd3d_shader_spirv_target_info *info = compiler->spirv_target_info;
-    const struct vkd3d_shader_domain_shader_compile_arguments *ds_args;
+    const struct vkd3d_shader_spirv_domain_shader_target_info *ds_info;
     struct vkd3d_spirv_builder *builder = &compiler->spirv_builder;
     const struct vkd3d_shader_phase *phase;
 
@@ -8685,14 +8685,14 @@ int vkd3d_dxbc_compiler_generate_spirv(struct vkd3d_dxbc_compiler *compiler,
 
     if (compiler->shader_type == VKD3D_SHADER_TYPE_DOMAIN)
     {
-        if (info && (ds_args = vkd3d_find_struct(info->next, DOMAIN_SHADER_COMPILE_ARGUMENTS)))
+        if (info && (ds_info = vkd3d_find_struct(info->next, SPIRV_DOMAIN_SHADER_TARGET_INFO)))
         {
-            vkd3d_dxbc_compiler_emit_tessellator_output_primitive(compiler, ds_args->output_primitive);
-            vkd3d_dxbc_compiler_emit_tessellator_partitioning(compiler, ds_args->partitioning);
+            vkd3d_dxbc_compiler_emit_tessellator_output_primitive(compiler, ds_info->output_primitive);
+            vkd3d_dxbc_compiler_emit_tessellator_partitioning(compiler, ds_info->partitioning);
         }
         else if (vkd3d_dxbc_compiler_is_opengl_target(compiler))
         {
-            ERR("vkd3d_shader_domain_shader_compile_arguments are required for "
+            ERR("vkd3d_shader_spirv_domain_shader_target_info is required for "
                     "OpenGL tessellation evaluation shader.\n");
         }
     }
-- 
2.11.0