Mesa (master): targets/libgl-xlib: add support for virgl

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: c9bc23d27ace5a98759814aedf678ac9c100dcc0
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c9bc23d27ace5a98759814aedf678ac9c100dcc0

Author: Chia-I Wu <olvaffe at gmail.com>
Date:   Fri Feb  5 14:57:39 2021 -0800

targets/libgl-xlib: add support for virgl

This allows testing virgl over vtest by setting GALLIUM_DRIVER=virpipe
when the X server uses a proprietary driver.

Signed-off-by: Chia-I Wu <olvaffe at gmail.com>
Tested-by: John Bates <jbates at chromium.org>
Reviewed-by: Adam Jackson <ajax at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8888>

---

 src/gallium/drivers/virgl/meson.build      | 2 +-
 src/gallium/targets/libgl-xlib/meson.build | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/virgl/meson.build b/src/gallium/drivers/virgl/meson.build
index 6a089a51290..6526b3b6e3c 100644
--- a/src/gallium/drivers/virgl/meson.build
+++ b/src/gallium/drivers/virgl/meson.build
@@ -37,7 +37,7 @@ libvirgl = static_library(
   [ files_libvirgl ],
   gnu_symbol_visibility : 'hidden',
   include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_virtio],
-  dependencies : [dep_libdrm, idep_mesautil],
+  dependencies : [dep_libdrm, idep_mesautil, idep_xmlconfig],
 )
 
 driver_virgl = declare_dependency(
diff --git a/src/gallium/targets/libgl-xlib/meson.build b/src/gallium/targets/libgl-xlib/meson.build
index 6aa450e9fc6..0323d611eb1 100644
--- a/src/gallium/targets/libgl-xlib/meson.build
+++ b/src/gallium/targets/libgl-xlib/meson.build
@@ -52,7 +52,7 @@ libgl = shared_library(
     libxlib, libws_xlib, libglapi_static,
     libgallium, libmesa_gallium, gallium_xlib_link_with,
   ],
-  dependencies : [dep_thread, dep_clock, dep_unwind, driver_swrast, driver_swr],
+  dependencies : [dep_thread, dep_clock, dep_unwind, driver_swrast, driver_swr, driver_virgl],
   install : true,
   version : '1.5.0',
 )