Henri Verbeet : vkd3d-shader: Rename the vkd3d_root_descriptor_table1 structure to vkd3d_shader_root_descriptor_table1.

[Alexandre Julliard]

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

Author: Henri Verbeet 
Date:   Fri Jul 17 14:32:23 2020 +0430

vkd3d-shader: Rename the vkd3d_root_descriptor_table1 structure to vkd3d_shader_root_descriptor_table1.

Signed-off-by: Henri Verbeet 
Signed-off-by: Alexandre Julliard

---

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 cbc4562..83def2d 100644
--- a/include/vkd3d_shader.h
+++ b/include/vkd3d_shader.h
@@ -534,7 +534,7 @@ struct vkd3d_shader_descriptor_range1
     unsigned int descriptor_table_offset;
 };

-struct vkd3d_root_descriptor_table1
+struct vkd3d_shader_root_descriptor_table1
 {
     unsigned int descriptor_range_count;
     const struct vkd3d_shader_descriptor_range1 *descriptor_ranges;
@@ -552,7 +552,7 @@ struct vkd3d_root_parameter1
     enum vkd3d_shader_root_parameter_type parameter_type;
     union
     {
-        struct vkd3d_root_descriptor_table1 descriptor_table;
+        struct vkd3d_shader_root_descriptor_table1 descriptor_table;
         struct vkd3d_shader_root_constants constants;
         struct vkd3d_root_descriptor1 descriptor;
     } u;
diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c
index 4f19b85..5df551b 100644
--- a/libs/vkd3d-shader/dxbc.c
+++ b/libs/vkd3d-shader/dxbc.c
@@ -2327,7 +2327,7 @@ static int shader_parse_descriptor_table(struct root_signature_parser_context *c
 }

static int shader_parse_descriptor_table1(struct root_signature_parser_context *context,
-        unsigned int offset, struct vkd3d_root_descriptor_table1 *table)
+        unsigned int offset, struct vkd3d_shader_root_descriptor_table1 *table)
 {
     struct vkd3d_shader_descriptor_range1 *ranges;
     unsigned int count;
@@ -2830,7 +2830,7 @@ static int shader_write_descriptor_ranges(struct root_signature_writer_context *
 }

static int shader_write_descriptor_ranges1(struct root_signature_writer_context *context,
-        const struct vkd3d_root_descriptor_table1 *table)
+        const struct vkd3d_shader_root_descriptor_table1 *table)
 {
     const struct vkd3d_shader_descriptor_range1 *ranges = table->descriptor_ranges;
     unsigned int i;
@@ -2866,7 +2866,7 @@ static int shader_write_descriptor_table(struct root_signature_writer_context *c
 }

static int shader_write_descriptor_table1(struct root_signature_writer_context *context,
-        const struct vkd3d_root_descriptor_table1 *table)
+        const struct vkd3d_shader_root_descriptor_table1 *table)
 {
     if (!write_dword(context, table->descriptor_range_count))
         return VKD3D_ERROR_OUT_OF_MEMORY;
@@ -3072,7 +3072,7 @@ static int validate_descriptor_table_v_1_0(const struct vkd3d_shader_root_descri
     return VKD3D_OK;
 }

-static int validate_descriptor_table_v_1_1(const struct vkd3d_root_descriptor_table1 *descriptor_table)
+static int validate_descriptor_table_v_1_1(const struct vkd3d_shader_root_descriptor_table1 *descriptor_table)
 {
     bool have_srv_uav_cbv = false;
     bool have_sampler = false;