[PATCH 3/5] 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@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); }
Henri Verbeet hverbeet@codeweavers.com writes:
This raises the required version of vkd3d to 1.2.
Signed-off-by: Henri Verbeet hverbeet@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])])
Does it make sense to have a separate check for vkd3d-shader then? It seems you can't use one without the other:
configure:16629: checking for -lvkd3d configure:16654: gcc -m64 -o conftest -g -O2 -fno-diagnostics-show-caret -I/usr/local/include/vkd3d conftest.c -lvkd3d -L/home/julliard/wine/vkd3d-installed/usr/local/lib -lvkd3d >&5 /usr/bin/ld: warning: libvkd3d-shader.so.1, needed by /home/julliard/wine/vkd3d-installed/usr/local/lib/libvkd3d.so, not found (try using -rpath or -rpath-link) /usr/bin/ld: /home/julliard/wine/vkd3d-installed/usr/local/lib/libvkd3d.so: undefined reference to `vkd3d_shader_parse_input_signature@VKD3D_1_0' /usr/bin/ld: /home/julliard/wine/vkd3d-installed/usr/local/lib/libvkd3d.so: undefined reference to `vkd3d_shader_parse_root_signature@VKD3D_1_0' /usr/bin/ld: /home/julliard/wine/vkd3d-installed/usr/local/lib/libvkd3d.so: undefined reference to `vkd3d_shader_free_shader_code@VKD3D_1_0' /usr/bin/ld: /home/julliard/wine/vkd3d-installed/usr/local/lib/libvkd3d.so: undefined reference to `vkd3d_shader_free_messages@VKD3D_1_0' /usr/bin/ld: /home/julliard/wine/vkd3d-installed/usr/local/lib/libvkd3d.so: undefined reference to `vkd3d_shader_convert_root_signature@VKD3D_1_0' /usr/bin/ld: /home/julliard/wine/vkd3d-installed/usr/local/lib/libvkd3d.so: undefined reference to `vkd3d_shader_free_shader_signature@VKD3D_1_0' /usr/bin/ld: /home/julliard/wine/vkd3d-installed/usr/local/lib/libvkd3d.so: undefined reference to `vkd3d_shader_scan@VKD3D_1_0' /usr/bin/ld: /home/julliard/wine/vkd3d-installed/usr/local/lib/libvkd3d.so: undefined reference to `vkd3d_shader_free_scan_descriptor_info@VKD3D_1_0' /usr/bin/ld: /home/julliard/wine/vkd3d-installed/usr/local/lib/libvkd3d.so: undefined reference to `vkd3d_shader_find_signature_element@VKD3D_1_0' /usr/bin/ld: /home/julliard/wine/vkd3d-installed/usr/local/lib/libvkd3d.so: undefined reference to `vkd3d_shader_serialize_root_signature@VKD3D_1_0' /usr/bin/ld: /home/julliard/wine/vkd3d-installed/usr/local/lib/libvkd3d.so: undefined reference to `vkd3d_shader_compile@VKD3D_1_0' /usr/bin/ld: /home/julliard/wine/vkd3d-installed/usr/local/lib/libvkd3d.so: undefined reference to `vkd3d_shader_free_root_signature@VKD3D_1_0' collect2: error: ld returned 1 exit status configure:16654: $? = 1
On Fri, 22 Jan 2021 at 11:43, Alexandre Julliard julliard@winehq.org wrote:
Does it make sense to have a separate check for vkd3d-shader then? It seems you can't use one without the other:
vkd3d-shader is a dependency of vkd3d, but the reverse is not true. For example, wined3d uses libvkd3d-shader without using libvkd3d. More, it seems likely we'll raise the vkd3d-shader requirement to 1.3 or 1.4 long before we'll raise the vkd3d requirement past 1.2, and the way things are looking at the moment, the vkd3d 1.3 release will not introduce new API for libvkd3d, but will introduce new API for libvkd3d-shader.
Henri Verbeet hverbeet@gmail.com writes:
On Fri, 22 Jan 2021 at 11:43, Alexandre Julliard julliard@winehq.org wrote:
Does it make sense to have a separate check for vkd3d-shader then? It seems you can't use one without the other:
vkd3d-shader is a dependency of vkd3d, but the reverse is not true. For example, wined3d uses libvkd3d-shader without using libvkd3d. More, it seems likely we'll raise the vkd3d-shader requirement to 1.3 or 1.4 long before we'll raise the vkd3d requirement past 1.2, and the way things are looking at the moment, the vkd3d 1.3 release will not introduce new API for libvkd3d, but will introduce new API for libvkd3d-shader.
OK, there's still a bug that we don't link vkd3d-shader when checking for vkd3d. I guess that should be fixed in the pkg-config file.
-
Alexandre Julliard -
Henri Verbeet -
Henri Verbeet