X-Git-Url: https://git.libre-soc.org/?p=mesa.git;a=blobdiff_plain;f=meson_options.txt;h=f5609cacc51754e8a43b8aedb1a4b07895d241e6;hp=1f72faabee8ec09e5fc8af357d327060c2dbd899;hb=55803224865d735f060c55cc8940946da725cb0b;hpb=f5eafc2dc6a68c9c2c2660dff528de1ecdedf4dc

diff --git a/meson_options.txt b/meson_options.txt
index 1f72faabee8..f5609cacc51 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
@@ -24,6 +24,7 @@ option(
   value : ['auto'],
   choices : [
     '', 'auto', 'x11', 'wayland', 'drm', 'surfaceless', 'haiku', 'android',
+    'windows',
   ],
   description : 'window systems to support. If this is set to `auto`, all platforms applicable will be enabled.'
 )
@@ -60,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'
 )
@@ -75,7 +76,7 @@ option(
   type : 'combo',
   value : 'auto',
   choices : ['auto', 'true', 'false'],
-  description : 'enable gallium vdpau state tracker.',
+  description : 'enable gallium vdpau frontend.',
 )
 option(
   'vdpau-libs-path',
@@ -88,7 +89,7 @@ option(
   type : 'combo',
   value : 'auto',
   choices : ['auto', 'true', 'false'],
-  description : 'enable gallium xvmc state tracker.',
+  description : 'enable gallium xvmc frontend.',
 )
 option(
   'xvmc-libs-path',
@@ -101,7 +102,7 @@ option(
   type : 'combo',
   value : 'auto',
   choices : ['auto', 'disabled', 'bellagio', 'tizonia'],
-  description : 'enable gallium omx state tracker.',
+  description : 'enable gallium omx frontend.',
 )
 option(
   'omx-libs-path',
@@ -114,7 +115,7 @@ option(
   type : 'combo',
   value : 'auto',
   choices : ['auto', 'true', 'false'],
-  description : 'enable gallium va state tracker.',
+  description : 'enable gallium va frontend.',
 )
 option(
   'va-libs-path',
@@ -127,20 +128,26 @@ option(
   type : 'combo',
   value : 'auto',
   choices : ['auto', 'true', 'false'],
-  description : 'enable gallium xa state tracker.',
+  description : 'enable gallium xa frontend.',
 )
 option(
   'gallium-nine',
   type : 'boolean',
   value : false,
-  description : 'build gallium "nine" Direct3D 9.x state tracker.',
+  description : 'build gallium "nine" Direct3D 9.x frontend.',
 )
 option(
   'gallium-opencl',
   type : 'combo',
   choices : ['icd', 'standalone', 'disabled'],
   value : 'disabled',
-  description : 'build gallium "clover" OpenCL state tracker.',
+  description : 'build gallium "clover" OpenCL frontend.',
+)
+option(
+  'opencl-spirv',
+  type : 'boolean',
+  value : false,
+  description : 'build gallium "clover" OpenCL frontend with SPIR-V binary support.',
 )
 option(
   'd3d-drivers-path',
@@ -175,10 +182,17 @@ option(
   description : 'Whether to build the vulkan overlay layer'
 )
 option(
-  'shared-glapi',
+  'vulkan-device-select-layer',
   type : 'boolean',
-  value : true,
-  description : 'Whether to build a shared or static glapi'
+  value : false,
+  description : 'Whether to build the vulkan device select layer'
+)
+option(
+  'shared-glapi',
+  type : 'combo',
+  value : 'auto',
+  choices : ['auto', 'true', 'false'],
+  description : 'Whether to build a shared or static glapi. Defaults to false on Windows, true elsewhere'
 )
 option(
   'gles1',
@@ -227,12 +241,6 @@ option(
   value : false,
   description : 'Enable GLVND support.'
 )
-option(
-  'asm',
-  type : 'boolean',
-  value : true,
-  description : 'Build assembly code if possible'
-)
 option(
    'glx-read-only-text',
    type : 'boolean',
@@ -248,9 +256,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',
@@ -312,11 +321,18 @@ 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',
   value : [],
-  choices : ['etnaviv', 'freedreno', 'glsl', 'intel', 'intel-ui', 'nir', 'nouveau', 'xvmc', 'all'],
+  choices : ['drm-shim', 'etnaviv', 'freedreno', 'glsl', 'intel', 'intel-ui', 'nir', 'nouveau', 'xvmc', 'lima', 'panfrost', 'all'],
   description : 'List of tools to build. (Note: `intel-ui` selects `intel`)',
 )
 option(
@@ -340,10 +356,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',
@@ -364,3 +380,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.'
+)