Henri Verbeet : vkd3d-shader: Rename the vkd3d_root_descriptor1 structure to vkd3d_shader_root_descriptor1.

[Alexandre Julliard]

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

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Fri Jul 17 14:32:24 2020 +0430

vkd3d-shader: Rename the vkd3d_root_descriptor1 structure to vkd3d_shader_root_descriptor1.

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

---

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

diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h
index 83def2d..d55a18d 100644
--- a/include/vkd3d_shader.h
+++ b/include/vkd3d_shader.h
@@ -540,7 +540,7 @@ struct vkd3d_shader_root_descriptor_table1
     const struct vkd3d_shader_descriptor_range1 *descriptor_ranges;
 };
 
-struct vkd3d_root_descriptor1
+struct vkd3d_shader_root_descriptor1
 {
     unsigned int shader_register;
     unsigned int register_space;
@@ -554,7 +554,7 @@ struct vkd3d_root_parameter1
     {
         struct vkd3d_shader_root_descriptor_table1 descriptor_table;
         struct vkd3d_shader_root_constants constants;
-        struct vkd3d_root_descriptor1 descriptor;
+        struct vkd3d_shader_root_descriptor1 descriptor;
     } u;
     enum vkd3d_shader_visibility shader_visibility;
 };
diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c
index 5df551b..e424aa6 100644
--- a/libs/vkd3d-shader/dxbc.c
+++ b/libs/vkd3d-shader/dxbc.c
@@ -2396,7 +2396,7 @@ static int shader_parse_root_descriptor(struct root_signature_parser_context *co
     return VKD3D_OK;
 }
 
-static void shader_validate_root_descriptor1(const struct vkd3d_root_descriptor1 *descriptor)
+static void shader_validate_root_descriptor1(const struct vkd3d_shader_root_descriptor1 *descriptor)
 {
     unsigned int unknown_flags = descriptor->flags & ~(VKD3D_SHADER_ROOT_DESCRIPTOR_FLAG_NONE
             | VKD3D_SHADER_ROOT_DESCRIPTOR_FLAG_DATA_VOLATILE
@@ -2408,7 +2408,7 @@ static void shader_validate_root_descriptor1(const struct vkd3d_root_descriptor1
 }
 
 static int shader_parse_root_descriptor1(struct root_signature_parser_context *context,
-        unsigned int offset, struct vkd3d_root_descriptor1 *descriptor)
+        unsigned int offset, struct vkd3d_shader_root_descriptor1 *descriptor)
 {
     const char *ptr;
 
@@ -2901,7 +2901,7 @@ static int shader_write_root_descriptor(struct root_signature_writer_context *co
 }
 
 static int shader_write_root_descriptor1(struct root_signature_writer_context *context,
-        const struct vkd3d_root_descriptor1 *descriptor)
+        const struct vkd3d_shader_root_descriptor1 *descriptor)
 {
     if (!write_dword(context, descriptor->shader_register))
         return VKD3D_ERROR_OUT_OF_MEMORY;