X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=meson_options.txt;h=d0ab500fb2797a9a677ac84c245113c6e54e4f02;hb=fa4e103c326a0411ff08984bc77e2feba35b8d9d;hp=11d2b198dd029234c19ecff1b70c28644f0512fe;hpb=66673bef941af344314fe9c91cad8cd330b245eb;p=mesa.git

diff --git a/meson_options.txt b/meson_options.txt
index 11d2b198dd0..d0ab500fb27 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -25,7 +25,7 @@ option(
   choices : [
     '', 'auto', 'x11', 'wayland', 'drm', 'surfaceless', 'haiku', 'android',
   ],
-  description : 'comma separated list of window systems to support. If this is set to auto all platforms applicable to the OS will be enabled.'
+  description : 'window systems to support. If this is set to `auto`, all platforms applicable will be enabled.'
 )
 option(
   'dri3',
@@ -58,9 +58,9 @@ option(
   type : 'array',
   value : ['auto'],
   choices : [
-    '', 'auto', 'pl111', 'radeonsi', 'r300', 'r600', 'nouveau', 'freedreno',
-    'swrast', 'v3d', 'vc4', 'etnaviv', 'imx', 'tegra', 'i915', 'svga', 'virgl',
-    'swr',
+    '', 'auto', 'kmsro', 'radeonsi', 'r300', 'r600', 'nouveau', 'freedreno',
+    'swrast', 'v3d', 'vc4', 'etnaviv', 'tegra', 'i915', 'svga', 'virgl',
+    'swr', 'panfrost'
   ],
   description : 'List of gallium drivers to build. If this is set to auto all drivers applicable to the target OS/architecture will be built'
 )
@@ -237,6 +237,12 @@ option(
   choices : ['auto', 'true', 'false'],
   description : 'Build with LLVM support.'
 )
+option(
+  'shared-llvm',
+  type : 'boolean',
+  value : true,
+  description : 'Whether to link llvm shared or statically.'
+)
 option(
   'valgrind',
   type : 'combo',
@@ -295,8 +301,8 @@ option(
   'tools',
   type : 'array',
   value : [],
-  choices : ['freedreno', 'glsl', 'intel', 'nir', 'nouveau', 'all'],
-  description : 'List of tools to build.',
+  choices : ['etnaviv', 'freedreno', 'glsl', 'intel', 'intel-ui', 'nir', 'nouveau', 'xvmc', 'all'],
+  description : 'List of tools to build. (Note: `intel-ui` selects `intel`)',
 )
 option(
   'power8',
@@ -305,3 +311,16 @@ option(
   choices : ['auto', 'true', 'false'],
   description : 'Enable power8 optimizations.',
 )
+option(
+  'xlib-lease',
+  type : 'combo',
+  value : 'auto',
+  choices : ['auto', 'true', 'false'],
+  description : 'Enable VK_EXT_acquire_xlib_display.'
+)
+option(
+  'glx-direct',
+  type : 'boolean',
+  value : true,
+  description : 'Enable direct rendering in GLX and EGL for DRI',
+)