[PATCH vkd3d 3/3] vkd3d: Initialise static samplers before the root descriptor tables.

Conor McCarthy cmccarthy at codeweavers.com
Tue Aug 10 01:11:01 CDT 2021


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 at codeweavers.com>
---
 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 46c81e1c..72fce8ab 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;
 
-- 
2.32.0




More information about the wine-devel mailing list