X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=meson_options.txt;h=bfb06c4dd42f94e3b991732788aba37aac41b048;hb=0428951b9d554faae13807e033d40c2e0698dc7b;hp=bfe2290868fda2249a90d717f21a2ba2cd33b46a;hpb=34bbb24ce7702658cdc4e9d34a650e169716c39e;p=mesa.git

diff --git a/meson_options.txt b/meson_options.txt
index bfe2290868f..bfb06c4dd42 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',
@@ -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',
@@ -264,12 +270,6 @@ option(
   value : false,
   description : 'Build unit tests. Currently this will build *all* unit tests, which may build more than expected.'
 )
-option(
-  'texture-float',
-  type : 'boolean',
-  value : false,
-  description : 'Enable floating point textures and renderbuffers. This option may be patent encumbered, please read docs/patents.txt and consult with your lawyer before turning this on.'
-)
 option(
   'selinux',
   type : 'boolean',
@@ -301,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',
@@ -311,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',
+)