fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-01 14:38:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

meson: Move Wayland dmabuf to wayland-drm

Browse source 
As the comment notes: linux-dmabuf has nothing to do with wayland-drm,
but we need a single place to build these files we can use from both EGL
and Vulkan, which is guaranteed to be included before both EGL and
Vulkan WSI.

Signed-off-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.co.uk>
This commit is contained in:
Daniel Stone 2018-01-25 08:29:38 +00:00
parent 65dda6c9ec
commit f766e1afa5
2 changed files with 22 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/egl/meson.build
View file

@ -58,20 +58,6 @@ files_egl = files(
'drivers/dri2/egl_dri2_fallbacks.h',
)
linux_dmabuf_unstable_v1_protocol_c = custom_target(
'linux-dmabuf-unstable-v1-protocol.c',
input : wayland_dmabuf_xml,
output : 'linux-dmabuf-unstable-v1-protocol.c',
command : [prog_wl_scanner, 'code', '@INPUT@', '@OUTPUT@'],
)
linux_dmabuf_unstable_v1_client_protocol_h = custom_target(
'linux-dmabuf-unstable-v1-client-protocol.h',
input : wayland_dmabuf_xml,
output : 'linux-dmabuf-unstable-v1-client-protocol.h',
command : [prog_wl_scanner, 'client-header', '@INPUT@', '@OUTPUT@'],
)
g_egldispatchstubs_c = custom_target(
'g_egldispatchstubs.c',
input : [

22
src/egl/wayland/wayland-drm/meson.build
View file

@ -48,3 +48,25 @@ libwayland_drm = static_library(
dependencies : [dep_wayland_server],
build_by_default : false,
)
# linux-dmabuf isn't part of wayland-drm, but this happens to be the only
# place which is a) guaranteed to be built when building either or both
# of EGL and Vulkan WSI, and b) guaranteed to be included before both,
# so the targets are actually defined by the time the files come to be
# used.
#
# Moving these to a src/wsi/ was suggested but shot down, so put these
# here for now as the maybe-least-bad solution.
linux_dmabuf_unstable_v1_protocol_c = custom_target(
'linux-dmabuf-unstable-v1-protocol.c',
input : wayland_dmabuf_xml,
output : 'linux-dmabuf-unstable-v1-protocol.c',
command : [prog_wl_scanner, 'code', '@INPUT@', '@OUTPUT@'],
)
linux_dmabuf_unstable_v1_client_protocol_h = custom_target(
'linux-dmabuf-unstable-v1-client-protocol.h',
input : wayland_dmabuf_xml,
output : 'linux-dmabuf-unstable-v1-client-protocol.h',
command : [prog_wl_scanner, 'client-header', '@INPUT@', '@OUTPUT@'],
)