[PATCH vkd3d] vkd3d: Do not report a root signature version higher than requested.

Rémi Bernon rbernon at codeweavers.com
Fri Oct 25 07:55:27 CDT 2019


This fixes Shadow of the Tomb Raider crashing because of NULL root
signatures being passed since c002aee119b638d30eeb7cdc91099449ccafeafc.

Signed-off-by: Rémi Bernon <rbernon at codeweavers.com>
---
 libs/vkd3d/device.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c
index d30c447c..30cee112 100644
--- a/libs/vkd3d/device.c
+++ b/libs/vkd3d/device.c
@@ -2512,7 +2512,8 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device *
                 return E_INVALIDARG;
             }

-            data->HighestVersion = D3D_ROOT_SIGNATURE_VERSION_1_1;
+            TRACE("Root signature requested %#x.\n", data->HighestVersion);
+            data->HighestVersion = min(data->HighestVersion, D3D_ROOT_SIGNATURE_VERSION_1_1);

             TRACE("Root signature version %#x.\n", data->HighestVersion);
             return S_OK;
--
2.24.0.rc0




More information about the wine-devel mailing list