[PATCH vkd3d 5/5] vkd3d-shader: Rename the vkd3d_root_parameter structure to vkd3d_shader_root_parameter.

[Henri Verbeet]

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

diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h
index d55a18d..631cbf5 100644
--- a/include/vkd3d_shader.h
+++ b/include/vkd3d_shader.h
@@ -467,7 +467,7 @@ enum vkd3d_shader_root_parameter_type
     VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_ROOT_PARAMETER_TYPE),
 };
 
-struct vkd3d_root_parameter
+struct vkd3d_shader_root_parameter
 {
     enum vkd3d_shader_root_parameter_type parameter_type;
     union
@@ -496,7 +496,7 @@ enum vkd3d_root_signature_flags
 struct vkd3d_root_signature_desc
 {
     unsigned int parameter_count;
-    const struct vkd3d_root_parameter *parameters;
+    const struct vkd3d_shader_root_parameter *parameters;
     unsigned int static_sampler_count;
     const struct vkd3d_static_sampler_desc *static_samplers;
     enum vkd3d_root_signature_flags flags;
diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c
index e424aa6..303bedd 100644
--- a/libs/vkd3d-shader/dxbc.c
+++ b/libs/vkd3d-shader/dxbc.c
@@ -2432,7 +2432,7 @@ static int shader_parse_root_descriptor1(struct root_signature_parser_context *c
 }
 
 static int shader_parse_root_parameters(struct root_signature_parser_context *context,
-        unsigned int offset, unsigned int count, struct vkd3d_root_parameter *parameters)
+        unsigned int offset, unsigned int count, struct vkd3d_shader_root_parameter *parameters)
 {
     const char *ptr;
     unsigned int i;
@@ -2596,7 +2596,7 @@ static int shader_parse_root_signature(const char *data, unsigned int data_size,
         v_1_0->parameter_count = count;
         if (v_1_0->parameter_count)
         {
-            struct vkd3d_root_parameter *parameters;
+            struct vkd3d_shader_root_parameter *parameters;
             if (!(parameters = vkd3d_calloc(v_1_0->parameter_count, sizeof(*parameters))))
                 return VKD3D_ERROR_OUT_OF_MEMORY;
             v_1_0->parameters = parameters;
@@ -3181,7 +3181,7 @@ int vkd3d_shader_serialize_root_signature(const struct vkd3d_versioned_root_sign
     return VKD3D_OK;
 }
 
-static void free_descriptor_ranges(const struct vkd3d_root_parameter *parameters, unsigned int count)
+static void free_descriptor_ranges(const struct vkd3d_shader_root_parameter *parameters, unsigned int count)
 {
     unsigned int i;
 
@@ -3190,14 +3190,14 @@ static void free_descriptor_ranges(const struct vkd3d_root_parameter *parameters
 
     for (i = 0; i < count; ++i)
     {
-        const struct vkd3d_root_parameter *p = &parameters[i];
+        const struct vkd3d_shader_root_parameter *p = &parameters[i];
 
         if (p->parameter_type == VKD3D_SHADER_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE)
             vkd3d_free((void *)p->u.descriptor_table.descriptor_ranges);
     }
 }
 
-static int convert_root_parameters_to_v_1_0(struct vkd3d_root_parameter *dst,
+static int convert_root_parameters_to_v_1_0(struct vkd3d_shader_root_parameter *dst,
         const struct vkd3d_root_parameter1 *src, unsigned int count)
 {
     const struct vkd3d_shader_descriptor_range1 *ranges1;
@@ -3208,7 +3208,7 @@ static int convert_root_parameters_to_v_1_0(struct vkd3d_root_parameter *dst,
     for (i = 0; i < count; ++i)
     {
         const struct vkd3d_root_parameter1 *p1 = &src[i];
-        struct vkd3d_root_parameter *p = &dst[i];
+        struct vkd3d_shader_root_parameter *p = &dst[i];
 
         p->parameter_type = p1->parameter_type;
         switch (p->parameter_type)
@@ -3264,8 +3264,8 @@ static int convert_root_signature_to_v1_0(struct vkd3d_versioned_root_signature_
 {
     const struct vkd3d_root_signature_desc1 *src_desc = &src->u.v_1_1;
     struct vkd3d_root_signature_desc *dst_desc = &dst->u.v_1_0;
+    struct vkd3d_shader_root_parameter *parameters = NULL;
     struct vkd3d_static_sampler_desc *samplers = NULL;
-    struct vkd3d_root_parameter *parameters = NULL;
     int ret;
 
     if ((dst_desc->parameter_count = src_desc->parameter_count))
@@ -3317,7 +3317,7 @@ static void free_descriptor_ranges1(const struct vkd3d_root_parameter1 *paramete
 }
 
 static int convert_root_parameters_to_v_1_1(struct vkd3d_root_parameter1 *dst,
-        const struct vkd3d_root_parameter *src, unsigned int count)
+        const struct vkd3d_shader_root_parameter *src, unsigned int count)
 {
     const struct vkd3d_shader_descriptor_range *ranges;
     struct vkd3d_shader_descriptor_range1 *ranges1;
@@ -3326,7 +3326,7 @@ static int convert_root_parameters_to_v_1_1(struct vkd3d_root_parameter1 *dst,
 
     for (i = 0; i < count; ++i)
     {
-        const struct vkd3d_root_parameter *p = &src[i];
+        const struct vkd3d_shader_root_parameter *p = &src[i];
         struct vkd3d_root_parameter1 *p1 = &dst[i];
 
         p1->parameter_type = p->parameter_type;
diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c
index f7489f6..8dbd17e 100644
--- a/libs/vkd3d-shader/vkd3d_shader_main.c
+++ b/libs/vkd3d-shader/vkd3d_shader_main.c
@@ -484,7 +484,7 @@ static void vkd3d_shader_free_root_signature_v_1_0(struct vkd3d_root_signature_d
 
     for (i = 0; i < root_signature->parameter_count; ++i)
     {
-        const struct vkd3d_root_parameter *parameter = &root_signature->parameters[i];
+        const struct vkd3d_shader_root_parameter *parameter = &root_signature->parameters[i];
 
         if (parameter->parameter_type == VKD3D_SHADER_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE)
             vkd3d_free((void *)parameter->u.descriptor_table.descriptor_ranges);
-- 
2.11.0