X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;ds=sidebyside;f=meson_options.txt;h=a342354acfceddf0a1eea9ef7d16f5dea72de689;hb=42093bb694bdcb6fb5bb762c118520c107456f4a;hp=dd7bf4bccaa4bce79bbf2b64cce098d6eea2e0e0;hpb=dbe923bff99cfca4f192db3b9ea88cd19ee7af85;p=mesa.git

diff --git a/meson_options.txt b/meson_options.txt
index dd7bf4bccaa..a342354acfc 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -250,9 +250,10 @@ option(
 )
 option(
   'shared-llvm',
-  type : 'boolean',
-  value : true,
-  description : 'Whether to link llvm shared or statically.'
+  type : 'combo',
+  value : 'auto',
+  choices : ['auto', 'true', 'false'],
+  description : 'Whether to link LLVM shared or statically.'
 )
 option(
   'valgrind',
@@ -314,6 +315,13 @@ option(
   choices : ['avx', 'avx2', 'knl', 'skx'],
   description : 'Architectures to build SWR support for.',
 )
+option(
+  'shared-swr',
+  type : 'boolean',
+  value : true,
+  description : 'Whether to link SWR shared or statically.',
+)
+
 option(
   'tools',
   type : 'array',
@@ -341,16 +349,10 @@ option(
   value : true,
   description : 'Enable direct rendering in GLX and EGL for DRI',
 )
-option(
-  'I-love-half-baked-turnips',
-  type : 'boolean',
-  value : false,
-  description : 'Allow work-in-progress freedreno vulkan driver to be enabled',
-)
 option(
   'prefer-iris',
   type : 'boolean',
-  value : false,
+  value : true,
   description : 'Prefer new Intel iris driver over older i965 driver'
 )
 option('egl-lib-suffix',