From 448eb19158f483d807ef5bff5242be3df82c7787 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Tue, 25 Jun 2019 14:23:15 +0100 Subject: [PATCH] vulkan: automatically compile the `display` platform when available Signed-off-by: Eric Engestrom Reviewed-by: Bas Nieuwenhuizen Reviewed-by: Emil Velikov Part-of: --- src/amd/vulkan/meson.build | 2 +- src/freedreno/vulkan/meson.build | 2 +- src/intel/vulkan/meson.build | 2 +- src/vulkan/meson.build | 2 +- src/vulkan/wsi/meson.build | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/amd/vulkan/meson.build b/src/amd/vulkan/meson.build index a44e785b223..aa27b82c98a 100644 --- a/src/amd/vulkan/meson.build +++ b/src/amd/vulkan/meson.build @@ -131,7 +131,7 @@ if with_platform_wayland libradv_files += files('radv_wsi_wayland.c') endif -if with_platform_drm +if system_has_kms_drm radv_flags += '-DVK_USE_PLATFORM_DISPLAY_KHR' libradv_files += files('radv_wsi_display.c') endif diff --git a/src/freedreno/vulkan/meson.build b/src/freedreno/vulkan/meson.build index 1aa714122a5..eab543e1c12 100644 --- a/src/freedreno/vulkan/meson.build +++ b/src/freedreno/vulkan/meson.build @@ -81,7 +81,7 @@ if with_platform_wayland libtu_files += files('tu_wsi_wayland.c') endif -if with_platform_drm +if system_has_kms_drm tu_flags += '-DVK_USE_PLATFORM_DISPLAY_KHR' libtu_files += files('tu_wsi_display.c') endif diff --git a/src/intel/vulkan/meson.build b/src/intel/vulkan/meson.build index c77a2e79e6f..aff495506d3 100644 --- a/src/intel/vulkan/meson.build +++ b/src/intel/vulkan/meson.build @@ -155,7 +155,7 @@ if with_platform_wayland libanv_files += files('anv_wsi_wayland.c') endif -if with_platform_drm +if system_has_kms_drm anv_flags += '-DVK_USE_PLATFORM_DISPLAY_KHR' libanv_files += files('anv_wsi_display.c') endif diff --git a/src/vulkan/meson.build b/src/vulkan/meson.build index eedbad91cb0..1e3f65c18d0 100644 --- a/src/vulkan/meson.build +++ b/src/vulkan/meson.build @@ -45,7 +45,7 @@ if with_platform_wayland vulkan_wsi_deps += dep_wayland_client vulkan_wsi_list += ['wayland'] endif -if with_platform_drm +if system_has_kms_drm vulkan_wsi_args += '-DVK_USE_PLATFORM_DISPLAY_KHR' vulkan_wsi_deps += [dep_libdrm] vulkan_wsi_list += ['drm'] diff --git a/src/vulkan/wsi/meson.build b/src/vulkan/wsi/meson.build index d098ba6eb4e..0186ca6d4a1 100644 --- a/src/vulkan/wsi/meson.build +++ b/src/vulkan/wsi/meson.build @@ -34,7 +34,7 @@ if with_platform_wayland ] endif -if with_platform_drm +if system_has_kms_drm files_vulkan_wsi += files('wsi_common_display.c') endif -- 2.30.2