Henri Verbeet : vkd3d-shader: Rename the vkd3d_root_descriptor structure to vkd3d_shader_root_descriptor.

[Alexandre Julliard]

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

Author: Henri Verbeet 
Date:   Thu Jul 16 14:56:46 2020 +0430

vkd3d-shader: Rename the vkd3d_root_descriptor structure to vkd3d_shader_root_descriptor.

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

---

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

diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h
index 0323766..b2c3dc9 100644
--- a/include/vkd3d_shader.h
+++ b/include/vkd3d_shader.h
@@ -450,7 +450,7 @@ struct vkd3d_shader_root_constants
     unsigned int value_count;
 };

-struct vkd3d_root_descriptor
+struct vkd3d_shader_root_descriptor
 {
     unsigned int shader_register;
     unsigned int register_space;
@@ -474,7 +474,7 @@ struct vkd3d_root_parameter
     {
         struct vkd3d_shader_root_descriptor_table descriptor_table;
         struct vkd3d_shader_root_constants constants;
-        struct vkd3d_root_descriptor descriptor;
+        struct vkd3d_shader_root_descriptor descriptor;
     } u;
     enum vkd3d_shader_visibility shader_visibility;
 };
diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c
index a247d5c..1fb8dc8 100644
--- a/libs/vkd3d-shader/dxbc.c
+++ b/libs/vkd3d-shader/dxbc.c
@@ -2376,7 +2376,7 @@ static int shader_parse_root_constants(struct root_signature_parser_context *con
 }

static int shader_parse_root_descriptor(struct root_signature_parser_context *context,
-        unsigned int offset, struct vkd3d_root_descriptor *descriptor)
+        unsigned int offset, struct vkd3d_shader_root_descriptor *descriptor)
 {
     const char *ptr;

@@ -2890,7 +2890,7 @@ static int shader_write_root_constants(struct root_signature_writer_context *con
 }

static int shader_write_root_descriptor(struct root_signature_writer_context *context,
-        const struct vkd3d_root_descriptor *descriptor)
+        const struct vkd3d_shader_root_descriptor *descriptor)
 {
     if (!write_dword(context, descriptor->shader_register))
         return VKD3D_ERROR_OUT_OF_MEMORY;