[PATCH vkd3d 4/5] build: Check VK_HEADER_VERSION.

Józef Kucia joseph.kucia at gmail.com
Fri Oct 26 09:24:51 CDT 2018


On Fri, Oct 26, 2018 at 3:07 PM Józef Kucia <joseph.kucia at gmail.com> wrote:
>
> From: Józef Kucia <jkucia at codeweavers.com>
>
> Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
> ---
>  configure.ac |  3 +++
>  m4/vulkan.m4 | 19 +++++++++++++++++++
>  2 files changed, 22 insertions(+)
>  create mode 100644 m4/vulkan.m4
>
> diff --git a/configure.ac b/configure.ac
> index 58672c510ab9..618b8c098876 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -61,6 +61,9 @@ AS_IF([test "x$ac_cv_header_spirv_unified1_GLSL_std_450_h" != "xyes" \
>         -a "x$ac_cv_header_vulkan_GLSL_std_450_h" != "xyes"],
>        [AC_MSG_ERROR([GLSL.std.450.h not found.])])
>
> +VKD3D_CHECK_VULKAN_HEADER_VERSION
> +AS_IF([test "$vkd3d_cv_vk_header_version" -lt 84], [AC_MSG_ERROR([Vulkan headers are too old, 1.1.84 is required.])])
> +
>  dnl Check for libraries
>  m4_ifdef([PKG_PROG_PKG_CONFIG], [PKG_PROG_PKG_CONFIG], [m4_fatal([pkg-config autoconf macros not found.])])
>
> diff --git a/m4/vulkan.m4 b/m4/vulkan.m4
> new file mode 100644
> index 000000000000..088be7d5faae
> --- /dev/null
> +++ b/m4/vulkan.m4
> @@ -0,0 +1,19 @@
> +dnl VKD3D_CHECK_VULKAN_HEADER_VERSION
> +AC_DEFUN([VKD3D_CHECK_VULKAN_HEADER_VERSION],
> +
> +[AS_VAR_PUSHDEF([vkd3d_vk_version], vkd3d_cv_vk_header_version)
> +AC_CACHE_CHECK([VK_HEADER_VERSION], vkd3d_vk_version,
> +               [AC_RUN_IFELSE(
> +               [AC_LANG_SOURCE([#include <stdio.h>
> +                               #include <vulkan/vulkan.h>
> +                               int main(void)
> +                               {
> +                                   FILE *f = fopen("conftest.out", "wb");
> +                                   if (!f) return 1;
> +                                   fprintf(f, "%u", VK_HEADER_VERSION);
> +                                   fclose(f);
> +                                   return 0;
> +                               }])],
> +               [AS_VAR_SET([vkd3d_vk_version], [`cat conftest.out`])],
> +               [AS_VAR_SET([vkd3d_vk_version], [0])])])
> +AS_VAR_POPDEF([vkd3d_vk_version])])
> --
> 2.18.1
>

This breaks cross-compilation. Please ignore the patch.



More information about the wine-devel mailing list