Henri Verbeet : d3d12: Implement D3D12SerializeVersionedRootSignature() on top of vkd3d_serialize_versioned_root_signature().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 681105fd482cb790568576c1d0a360288904ec82
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=681105fd482cb790568576c1d...

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Fri Jan 22 10:45:23 2021 +0100

d3d12: Implement D3D12SerializeVersionedRootSignature() on top of vkd3d_serialize_versioned_root_signature().

This raises the required version of vkd3d to 1.2.

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

---

 configure               | 4 ++--
 configure.ac            | 2 +-
 dlls/d3d12/d3d12_main.c | 6 +-----
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/configure b/configure
index ef09f65f11e..4cb23101f4c 100755
--- a/configure
+++ b/configure
@@ -16642,11 +16642,11 @@ LIBS="-lvkd3d $VKD3D_LIBS $LIBS"
 #ifdef __cplusplus
 extern "C"
 #endif
-char vkd3d_get_dxgi_format ();
+char vkd3d_serialize_versioned_root_signature ();
 int
 main ()
 {
-return vkd3d_get_dxgi_format ();
+return vkd3d_serialize_versioned_root_signature ();
   ;
   return 0;
 }
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);
 }