Henri Verbeet : vkd3d-shader: Rename the vkd3d_root_descriptor_table structure to vkd3d_shader_root_descriptor_table.

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: 36d21277650f821b7532dd5e89c86500ae39bedc
URL:    https://source.winehq.org/git/vkd3d.git/?a=commit;h=36d21277650f821b7532dd5e...

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Thu Jul 16 14:56:44 2020 +0430

vkd3d-shader: Rename the vkd3d_root_descriptor_table structure to vkd3d_shader_root_descriptor_table.

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

---

 include/vkd3d_shader.h   | 4 ++--
 libs/vkd3d-shader/dxbc.c | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h
index 1ce701c..6fa2505 100644
--- a/include/vkd3d_shader.h
+++ b/include/vkd3d_shader.h
@@ -437,7 +437,7 @@ struct vkd3d_shader_descriptor_range
     unsigned int descriptor_table_offset;
 };
 
-struct vkd3d_root_descriptor_table
+struct vkd3d_shader_root_descriptor_table
 {
     unsigned int descriptor_range_count;
     const struct vkd3d_shader_descriptor_range *descriptor_ranges;
@@ -472,7 +472,7 @@ struct vkd3d_root_parameter
     enum vkd3d_shader_root_parameter_type parameter_type;
     union
     {
-        struct vkd3d_root_descriptor_table descriptor_table;
+        struct vkd3d_shader_root_descriptor_table descriptor_table;
         struct vkd3d_root_constants constants;
         struct vkd3d_root_descriptor descriptor;
     } u;
diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c
index 6297a04..0848c04 100644
--- a/libs/vkd3d-shader/dxbc.c
+++ b/libs/vkd3d-shader/dxbc.c
@@ -2300,7 +2300,7 @@ static int shader_parse_descriptor_ranges1(struct root_signature_parser_context
 }
 
 static int shader_parse_descriptor_table(struct root_signature_parser_context *context,
-        unsigned int offset, struct vkd3d_root_descriptor_table *table)
+        unsigned int offset, struct vkd3d_shader_root_descriptor_table *table)
 {
     struct vkd3d_shader_descriptor_range *ranges;
     unsigned int count;
@@ -2807,7 +2807,7 @@ static int shader_write_root_signature_header(struct root_signature_writer_conte
 }
 
 static int shader_write_descriptor_ranges(struct root_signature_writer_context *context,
-        const struct vkd3d_root_descriptor_table *table)
+        const struct vkd3d_shader_root_descriptor_table *table)
 {
     const struct vkd3d_shader_descriptor_range *ranges = table->descriptor_ranges;
     unsigned int i;
@@ -2855,7 +2855,7 @@ static int shader_write_descriptor_ranges1(struct root_signature_writer_context
 }
 
 static int shader_write_descriptor_table(struct root_signature_writer_context *context,
-        const struct vkd3d_root_descriptor_table *table)
+        const struct vkd3d_shader_root_descriptor_table *table)
 {
     if (!write_dword(context, table->descriptor_range_count))
         return VKD3D_ERROR_OUT_OF_MEMORY;
@@ -3036,7 +3036,7 @@ static int shader_write_root_signature(struct root_signature_writer_context *con
     return shader_write_static_samplers(context, desc);
 }
 
-static int validate_descriptor_table_v_1_0(const struct vkd3d_root_descriptor_table *descriptor_table)
+static int validate_descriptor_table_v_1_0(const struct vkd3d_shader_root_descriptor_table *descriptor_table)
 {
     bool have_srv_uav_cbv = false;
     bool have_sampler = false;