vulkan: automatically compile the `display` platform when available

Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3161>

diff --git a/src/amd/vulkan/meson.build b/src/amd/vulkan/meson.build
index a44e785b22319deb855ef1cdfce72aae6b8bfa46..aa27b82c98a072d5583ca85eed68faf1e43906f7 100644 (file)
--- 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 1aa714122a53b007cdf150e86b0b047f81bcd86e..eab543e1c12767a3512fcda19ff2044ef9a7a7f4 100644 (file)
--- 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 c77a2e79e6ff89b15134ebdb4297ada90b39074e..aff495506d32939c0dd7dd6f376d31dc7db95f68 100644 (file)
--- 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 eedbad91cb02fa804160cf6013df549344fa7f3f..1e3f65c18d0a263d8a9e920585964831e5aefbef 100644 (file)
--- 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 d098ba6eb4e3829e7c979946715d13e4220188d8..0186ca6d4a1640d4f80c1d4c695f1a8561eb447f 100644 (file)
--- 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