meson: fix android vulkan build

[mesa.git] / src / vulkan / wsi / meson.build

diff --git a/src/vulkan/wsi/meson.build b/src/vulkan/wsi/meson.build
index 66ccc8316ec625fc4afaf9499a2e57aa5f03cbba..687f5894882e47fcdb1dbcd48f05655f60c4e698 100644 (file)
--- a/src/vulkan/wsi/meson.build
+++ b/src/vulkan/wsi/meson.build
@@ -18,50 +18,32 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-vulkan_wsi_args = []
-vulkan_wsi_deps = []
+files_vulkan_wsi = files('wsi_common.c')
 
-files_vulkan_wsi = files(
-  'wsi_common.c',
-  'wsi_common.h',
-  'wsi_common_private.h',
-  'wsi_common_queue.h',
-)
 if with_platform_x11
-  vulkan_wsi_args += ['-DVK_USE_PLATFORM_XCB_KHR', '-DVK_USE_PLATFORM_XLIB_KHR']
-  vulkan_wsi_deps += [
-    dep_xcb,
-    dep_x11_xcb,
-    dep_xcb_dri2,
-    dep_xcb_dri3,
-    dep_xcb_present,
-    dep_xcb_sync,
-    dep_xshmfence,
-  ]
-  files_vulkan_wsi += files(
-    'wsi_common_x11.c',
-    'wsi_common_x11.h',
-  )
+  files_vulkan_wsi += files('wsi_common_x11.c')
 endif
 
 if with_platform_wayland
-  vulkan_wsi_deps += dep_wayland_client
-  vulkan_wsi_args += ['-DVK_USE_PLATFORM_WAYLAND_KHR']
-  files_vulkan_wsi += files(
-    'wsi_common_wayland.c',
-    'wsi_common_wayland.h',
-  )
+  files_vulkan_wsi += files('wsi_common_wayland.c')
   files_vulkan_wsi += [
     wayland_drm_client_protocol_h,
     wayland_drm_protocol_c,
+    linux_dmabuf_unstable_v1_client_protocol_h,
+    linux_dmabuf_unstable_v1_protocol_c,
   ]
 endif
 
+if system_has_kms_drm and not with_platform_android
+  files_vulkan_wsi += files('wsi_common_display.c')
+endif
+
 libvulkan_wsi = static_library(
   'vulkan_wsi',
   files_vulkan_wsi,
-  include_directories : [inc_common, inc_vulkan_util, inc_drm_uapi],
-  dependencies : [vulkan_wsi_deps, dep_libdrm],
-  c_args : [c_vis_args, vulkan_wsi_args],
+  include_directories : [inc_include, inc_src],
+  dependencies : [vulkan_wsi_deps, dep_libdrm, idep_vulkan_util, idep_xmlconfig],
+  c_args : [vulkan_wsi_args],
+  gnu_symbol_visibility : 'hidden',
   build_by_default : false,
 )