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_PACKAGE_FLAGS(VKD3D_SHADER,[libvkd3d-shader],,,, [WINE_CHECK_SONAME(vkd3d-shader,vkd3d_shader_compile,,,[$VKD3D_SHADER_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