Józef Kucia : vkd3d: Prefer vkd3d_shader_parse_versioned_root_signature().

[Alexandre Julliard]

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

Author: Józef Kucia 
Date:   Fri Apr 19 11:07:35 2019 +0200

vkd3d: Prefer vkd3d_shader_parse_versioned_root_signature().

Signed-off-by: Józef Kucia 
Signed-off-by: Henri Verbeet 
Signed-off-by: Alexandre Julliard

---

libs/vkd3d/state.c         | 2 +-
 libs/vkd3d/vkd3d_main.c    | 2 +-
 libs/vkd3d/vkd3d_private.h | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c
index 85ecb39..7534655 100644
--- a/libs/vkd3d/state.c
+++ b/libs/vkd3d/state.c
@@ -1006,7 +1006,7 @@ HRESULT d3d12_root_signature_create(struct d3d12_device *device,
     HRESULT hr;
     int ret;

-    if ((ret = vkd3d_shader_parse_root_signature(&dxbc, &root_signature_desc.vkd3d)) < 0)
+    if ((ret = vkd3d_parse_root_signature_v_1_0(&dxbc, &root_signature_desc.vkd3d)) < 0)
     {
         WARN("Failed to parse root signature, vkd3d result %d.\n", ret);
         return hresult_from_vkd3d_result(ret);
diff --git a/libs/vkd3d/vkd3d_main.c b/libs/vkd3d/vkd3d_main.c
index 9af2bbc..e074d1c 100644
--- a/libs/vkd3d/vkd3d_main.c
+++ b/libs/vkd3d/vkd3d_main.c
@@ -167,7 +167,7 @@ static const struct ID3D12RootSignatureDeserializerVtbl d3d12_root_signature_des
     d3d12_root_signature_deserializer_GetRootSignatureDesc,
 };

-static int vkd3d_parse_root_signature_v_1_0(const struct vkd3d_shader_code *dxbc,
+int vkd3d_parse_root_signature_v_1_0(const struct vkd3d_shader_code *dxbc,
         struct vkd3d_root_signature_desc *out_desc)
 {
     struct vkd3d_versioned_root_signature_desc desc, converted_desc;
diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h
index be0ef2e..c680a04 100644
--- a/libs/vkd3d/vkd3d_private.h
+++ b/libs/vkd3d/vkd3d_private.h
@@ -619,6 +619,9 @@ HRESULT d3d12_root_signature_create(struct d3d12_device *device, const void *byt
         size_t bytecode_length, struct d3d12_root_signature **root_signature) DECLSPEC_HIDDEN;
 struct d3d12_root_signature *unsafe_impl_from_ID3D12RootSignature(ID3D12RootSignature *iface) DECLSPEC_HIDDEN;

+int vkd3d_parse_root_signature_v_1_0(const struct vkd3d_shader_code *dxbc,
+        struct vkd3d_root_signature_desc *desc) DECLSPEC_HIDDEN;
+
 struct d3d12_graphics_pipeline_state
 {
     VkPipelineShaderStageCreateInfo stages[VKD3D_MAX_SHADER_STAGES];