meson: add support for xlib glx

There is a bunch of churn in the main meson.build so that we can
correctly set the auto tristate of GLX. In particular, don't build
xlib-based glx when dri and gallium are disabled but vulkan is enabled,
in that case just turn glx off.

Signed-off-by: Dylan Baker <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>

2 files changed, 42 insertions, 5 deletions

diff --git a/src/mesa/drivers/x11/meson.build b/src/mesa/drivers/x11/meson.build
new file mode 100644
index 00000000000..bb4fda14cb8
--- /dev/null
+++ b/src/mesa/drivers/x11/meson.build
@@ -0,0 +1,39 @@
+# Copyright © 2017 Intel Corporation
+
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+gl_link_with = []
+if with_shared_glapi
+  gl_link_with += libglapi
+endif
+
+libgl = shared_library(
+  'GL',
+  files(
+    'fakeglx.c', 'glxapi.c', 'xfonts.c', 'xm_api.c', 'xm_buffer.c', 'xm_dd.c',
+    'xm_line.c', 'xm_tri.c',
+  ),
+  include_directories : [
+    inc_include, inc_src, inc_mesa, inc_mapi, inc_gallium, inc_gallium_aux
+  ],
+  link_with : [libmesa_classic, libglapi_static, gl_link_with],
+  dependencies : [dep_x11, dep_xext, dep_xcb, dep_thread],
+  version : '1.6.0',
+  install : true,
+)
diff --git a/src/mesa/meson.build b/src/mesa/meson.build
index 20d06aad4dd..b839fd02981 100644
--- a/src/mesa/meson.build
+++ b/src/mesa/meson.build
@@ -19,15 +19,10 @@
 # SOFTWARE.
 
 # TODO: main/tests
-# TODO: xlib_glx
-# TODO: osmesa
-# TODO: asm_offsets
 
 subdir('program')
 subdir('main')
 
-# program files
-# program nir files
 # files shared between classic mesa and gallium mesa
 files_libmesa_common = files(
   'program/arbprogparse.c',
@@ -721,6 +716,9 @@ subdir('drivers/dri')
 if with_osmesa == 'classic'
   subdir('drivers/osmesa')
 endif
+if with_glx == 'xlib'
+  subdir('drivers/x11')
+endif
 if with_tests
   subdir('main/tests')
 endif