X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=meson_options.txt;h=a39596a6f19d970f9b78f576213a4e8c948abf3b;hb=babf7357d24b88a548f50aebca74c6ffd8f81d52;hp=3ab2900f929ea1871161f3466d566fda5f09e1b2;hpb=866f6f11d928e6e9b1a45468ec9d6cf12b7f2778;p=mesa.git

diff --git a/meson_options.txt b/meson_options.txt
index 3ab2900f929..a39596a6f19 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,4 +1,4 @@
-# Copyright © 2017-2018 Intel Corporation
+# Copyright © 2017-2019 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
@@ -61,7 +61,7 @@ option(
   choices : [
     '', 'auto', 'kmsro', 'radeonsi', 'r300', 'r600', 'nouveau', 'freedreno',
     'swrast', 'v3d', 'vc4', 'etnaviv', 'tegra', 'i915', 'svga', 'virgl',
-    'swr', 'panfrost', 'iris', 'lima'
+    'swr', 'panfrost', 'iris', 'lima', 'zink'
   ],
   description : 'List of gallium drivers to build. If this is set to auto all drivers applicable to the target OS/architecture will be built'
 )
@@ -314,6 +314,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',
@@ -342,10 +349,10 @@ option(
   description : 'Enable direct rendering in GLX and EGL for DRI',
 )
 option(
-  'I-love-half-baked-turnips',
+  'prefer-iris',
   type : 'boolean',
-  value : false,
-  description : 'Allow work-in-progress freedreno vulkan driver to be enabled',
+  value : true,
+  description : 'Prefer new Intel iris driver over older i965 driver'
 )
 option('egl-lib-suffix',
   type : 'string',
@@ -366,3 +373,10 @@ option(
   value : 25,
   description : 'Android Platform SDK version. Default: Nougat version.'
 )
+option(
+  'zstd',
+  type : 'combo',
+  choices : ['auto', 'true', 'false'],
+  value : 'auto',
+  description : 'Use ZSTD instead of ZLIB in some cases.'
+)