[PATCH 3/5] d3d12: Implement D3D12SerializeVersionedRootSignature() on top of vkd3d_serialize_versioned_root_signature().

Henri Verbeet hverbeet at codeweavers.com
Fri Jan 22 03:45:23 CST 2021


This raises the required version of vkd3d to 1.2.

Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
---
 configure.ac            | 2 +-
 dlls/d3d12/d3d12_main.c | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index 1921307da31..0f8b9f6c080 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1971,7 +1971,7 @@ dnl **** Check for vkd3d ****
 if test "x$with_vkd3d" != "xno"
 then
     WINE_PACKAGE_FLAGS(VKD3D,[libvkd3d],,,,
-        [WINE_CHECK_SONAME(vkd3d,vkd3d_get_dxgi_format,,,[$VKD3D_LIBS])])
+        [WINE_CHECK_SONAME(vkd3d,vkd3d_serialize_versioned_root_signature,,,[$VKD3D_LIBS])])
     WINE_PACKAGE_FLAGS(VKD3D_SHADER,[libvkd3d-shader],,,,
         [WINE_CHECK_SONAME(vkd3d-shader,vkd3d_shader_compile,,,[$VKD3D_SHADER_LIBS])])
 fi
diff --git a/dlls/d3d12/d3d12_main.c b/dlls/d3d12/d3d12_main.c
index bd680d8254d..9f0fa12ee82 100644
--- a/dlls/d3d12/d3d12_main.c
+++ b/dlls/d3d12/d3d12_main.c
@@ -420,9 +420,5 @@ HRESULT WINAPI D3D12SerializeVersionedRootSignature(const D3D12_VERSIONED_ROOT_S
 {
     TRACE("desc %p, blob %p, error_blob %p.\n", desc, blob, error_blob);
 
-    if (desc->Version == D3D_ROOT_SIGNATURE_VERSION_1_0)
-        return vkd3d_serialize_root_signature(&desc->Desc_1_0, desc->Version, blob, error_blob);
-
-    FIXME("Unsupported version %#x.\n", desc->Version);
-    return E_NOTIMPL;
+    return vkd3d_serialize_versioned_root_signature(desc, blob, error_blob);
 }
-- 
2.20.1




More information about the wine-devel mailing list