Henri Verbeet : vkd3d-shader: Rename the vkd3d_root_signature_desc structure to vkd3d_shader_root_signature_desc.

[Alexandre Julliard]

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

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Tue Jul 21 15:38:03 2020 +0430

vkd3d-shader: Rename the vkd3d_root_signature_desc structure to vkd3d_shader_root_signature_desc.

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 +++---
 libs/vkd3d-shader/vkd3d_shader_main.c | 2 +-
 libs/vkd3d/vkd3d_main.c               | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h
index 24e2f24..a5a3498 100644
--- a/include/vkd3d_shader.h
+++ b/include/vkd3d_shader.h
@@ -493,7 +493,7 @@ enum vkd3d_shader_root_signature_flags
     VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_ROOT_SIGNATURE_FLAGS),
 };
 
-struct vkd3d_root_signature_desc
+struct vkd3d_shader_root_signature_desc
 {
     unsigned int parameter_count;
     const struct vkd3d_shader_root_parameter *parameters;
@@ -581,7 +581,7 @@ struct vkd3d_versioned_root_signature_desc
     enum vkd3d_shader_root_signature_version version;
     union
     {
-        struct vkd3d_root_signature_desc v_1_0;
+        struct vkd3d_shader_root_signature_desc v_1_0;
         struct vkd3d_root_signature_desc1 v_1_1;
     } u;
 };
diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c
index e871963..1be733a 100644
--- a/libs/vkd3d-shader/dxbc.c
+++ b/libs/vkd3d-shader/dxbc.c
@@ -2563,7 +2563,7 @@ static int shader_parse_static_samplers(struct root_signature_parser_context *co
 static int shader_parse_root_signature(const char *data, unsigned int data_size,
         struct vkd3d_versioned_root_signature_desc *desc)
 {
-    struct vkd3d_root_signature_desc *v_1_0 = &desc->u.v_1_0;
+    struct vkd3d_shader_root_signature_desc *v_1_0 = &desc->u.v_1_0;
     struct root_signature_parser_context context;
     unsigned int count, offset, version;
     const char *ptr = data;
@@ -3263,7 +3263,7 @@ static int convert_root_signature_to_v1_0(struct vkd3d_versioned_root_signature_
         const struct vkd3d_versioned_root_signature_desc *src)
 {
     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_signature_desc *dst_desc = &dst->u.v_1_0;
     struct vkd3d_shader_static_sampler_desc *samplers = NULL;
     struct vkd3d_shader_root_parameter *parameters = NULL;
     int ret;
@@ -3383,7 +3383,7 @@ fail:
 static int convert_root_signature_to_v1_1(struct vkd3d_versioned_root_signature_desc *dst,
         const struct vkd3d_versioned_root_signature_desc *src)
 {
-    const struct vkd3d_root_signature_desc *src_desc = &src->u.v_1_0;
+    const struct vkd3d_shader_root_signature_desc *src_desc = &src->u.v_1_0;
     struct vkd3d_root_signature_desc1 *dst_desc = &dst->u.v_1_1;
     struct vkd3d_shader_static_sampler_desc *samplers = NULL;
     struct vkd3d_shader_root_parameter1 *parameters = NULL;
diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c
index ff02eca..80dbda1 100644
--- a/libs/vkd3d-shader/vkd3d_shader_main.c
+++ b/libs/vkd3d-shader/vkd3d_shader_main.c
@@ -478,7 +478,7 @@ void vkd3d_shader_free_shader_code(struct vkd3d_shader_code *shader_code)
     vkd3d_free((void *)shader_code->code);
 }
 
-static void vkd3d_shader_free_root_signature_v_1_0(struct vkd3d_root_signature_desc *root_signature)
+static void vkd3d_shader_free_root_signature_v_1_0(struct vkd3d_shader_root_signature_desc *root_signature)
 {
     unsigned int i;
 
diff --git a/libs/vkd3d/vkd3d_main.c b/libs/vkd3d/vkd3d_main.c
index 964c6f5..f9a6aa4 100644
--- a/libs/vkd3d/vkd3d_main.c
+++ b/libs/vkd3d/vkd3d_main.c
@@ -92,7 +92,7 @@ struct d3d12_root_signature_deserializer
     } desc;
 };
 
-STATIC_ASSERT(sizeof(D3D12_ROOT_SIGNATURE_DESC) == sizeof(struct vkd3d_root_signature_desc));
+STATIC_ASSERT(sizeof(D3D12_ROOT_SIGNATURE_DESC) == sizeof(struct vkd3d_shader_root_signature_desc));
 
 static struct d3d12_root_signature_deserializer *impl_from_ID3D12RootSignatureDeserializer(
         ID3D12RootSignatureDeserializer *iface)
@@ -564,7 +564,7 @@ HRESULT vkd3d_serialize_root_signature(const D3D12_ROOT_SIGNATURE_DESC *desc,
         *error_blob = NULL;
 
     vkd3d_desc.version = VKD3D_SHADER_ROOT_SIGNATURE_VERSION_1_0;
-    vkd3d_desc.u.v_1_0 = *(const struct vkd3d_root_signature_desc *)desc;
+    vkd3d_desc.u.v_1_0 = *(const struct vkd3d_shader_root_signature_desc *)desc;
     if ((ret = vkd3d_shader_serialize_root_signature(&vkd3d_desc, &dxbc)) < 0)
     {
         WARN("Failed to serialize root signature, vkd3d result %d.\n", ret);