Conor McCarthy : vkd3d: Initialise static samplers before the root descriptor tables.

[Alexandre Julliard]

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

Author: Conor McCarthy <cmccarthy(a)codeweavers.com>
Date:   Tue Aug 10 16:11:01 2021 +1000

vkd3d: Initialise static samplers before the root descriptor tables.

If static samplers are done after an unbounded range has been initialised,
the samplers will occupy their own descriptor set layout instead of sharing
one with the bounded ranges.

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 libs/vkd3d/state.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c
index 46c81e1..f9efeee 100644
--- a/libs/vkd3d/state.c
+++ b/libs/vkd3d/state.c
@@ -1000,10 +1000,10 @@ static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signa
     if (FAILED(hr = d3d12_root_signature_init_push_constants(root_signature, desc,
             root_signature->push_constant_ranges, &root_signature->push_constant_range_count)))
         goto fail;
-    if (FAILED(hr = d3d12_root_signature_init_root_descriptor_tables(root_signature, desc, &context)))
-        goto fail;
     if (FAILED(hr = d3d12_root_signature_init_static_samplers(root_signature, device, desc, &context)))
         goto fail;
+    if (FAILED(hr = d3d12_root_signature_init_root_descriptor_tables(root_signature, desc, &context)))
+        goto fail;
 
     root_signature->main_set = root_signature->vk_set_count;