Import Mesa 22.3.4

1 files changed, 53 insertions, 25 deletions

diff --git a/lib/mesa/meson_options.txt b/lib/mesa/meson_options.txt
index 5baa70d05..6f3070188 100644
--- a/lib/mesa/meson_options.txt
+++ b/lib/mesa/meson_options.txt
@@ -99,19 +99,6 @@ option(
   description : 'path to put vdpau libraries. defaults to $libdir/vdpau.'
 )
 option(
-  'gallium-xvmc',
-  type : 'combo',
-  value : 'auto',
-  choices : ['auto', 'true', 'false', 'enabled', 'disabled'],
-  description : 'enable gallium xvmc frontend.',
-)
-option(
-  'xvmc-libs-path',
-  type : 'string',
-  value : '',
-  description : 'path to put xvmc libraries. defaults to $libdir.'
-)
-option(
   'gallium-omx',
   type : 'combo',
   value : 'auto',
@@ -164,16 +151,22 @@ option(
   description : 'build gallium "clover" OpenCL frontend.',
 )
 option(
-  'opencl-spirv',
+  'gallium-rusticl',
   type : 'boolean',
   value : false,
-  description : 'build gallium "clover" OpenCL frontend with SPIR-V binary support.',
+  description : 'build gallium "rusticl" OpenCL frontend.',
 )
 option(
-  'opencl-native',
+  'gallium-windows-dll-name',
+  type : 'string',
+  value : 'libgallium_wgl',
+  description : 'name of gallium megadriver DLL built for Windows. defaults to libgallium_wgl.dll to match DRI',
+)
+option(
+  'opencl-spirv',
   type : 'boolean',
-  value : true,
-  description : 'build gallium "clover" OpenCL frontend with native LLVM codegen support.',
+  value : false,
+  description : 'build gallium "clover" OpenCL frontend with SPIR-V binary support.',
 )
 option(
   'static-libclc',
@@ -192,7 +185,7 @@ option(
   'vulkan-drivers',
   type : 'array',
   value : ['auto'],
-  choices : ['auto', 'amd', 'broadcom', 'freedreno', 'imagination-experimental', 'intel', 'microsoft-experimental', 'panfrost', 'swrast', 'virtio-experimental'],
+  choices : ['auto', 'amd', 'broadcom', 'freedreno', 'imagination-experimental', 'intel', 'intel_hasvk', 'microsoft-experimental', 'panfrost', 'swrast', 'virtio-experimental'],
   description : 'List of vulkan drivers to build. If this is set to auto all drivers applicable to the target OS/architecture will be built'
 )
 option(
@@ -357,7 +350,7 @@ option(
 option(
   'draw-use-llvm',
   type : 'boolean',
-  value : 'true',
+  value : true,
   description : 'Whether to use LLVM for the Gallium draw module, if LLVM is included.'
 )
 option(
@@ -388,6 +381,12 @@ option(
   description : 'Build unit tests. Currently this will build *all* unit tests except the ACO tests, which may build more than expected.'
 )
 option(
+  'enable-glcpp-tests',
+  type : 'boolean',
+  value : true,
+  description : 'Build glcpp unit tests. These are flaky on CI.'
+)
+option(
   'build-aco-tests',
   type : 'boolean',
   value : false,
@@ -420,16 +419,16 @@ option(
 option(
   'osmesa-bits',
   type : 'combo',
-  value : '8',
-  choices : ['8', '16', '32'],
-  description : 'Number of channel bits for OSMesa.'
+  value : 'unspecified',
+  choices : ['unspecified', '8', '16', '32'],
+  description : 'DEPRECATED: Number of channel bits for OSMesa.'
 )
 
 option(
   'tools',
   type : 'array',
   value : [],
-  choices : ['drm-shim', 'etnaviv', 'freedreno', 'glsl', 'intel', 'intel-ui', 'nir', 'nouveau', 'xvmc', 'lima', 'panfrost', 'asahi', 'imagination', 'all', 'dlclose-skip'],
+  choices : ['drm-shim', 'etnaviv', 'freedreno', 'glsl', 'intel', 'intel-ui', 'nir', 'nouveau', 'lima', 'panfrost', 'asahi', 'imagination', 'all', 'dlclose-skip'],
   description : 'List of tools to build. (Note: `intel-ui` selects `intel`)',
 )
 option(
@@ -525,5 +524,34 @@ option(
   'intel-clc',
   type : 'feature',
   value : 'disabled',
-  description : 'Build the intel-clc compiler (required for ray queries).'
+  description : 'Build the intel-clc compiler (enables Vulkan Intel Ray Tracing on supported hardware).'
+)
+option(
+  'video-codecs',
+  type : 'array',
+  value : [],
+  choices: [
+    'vc1dec', 'h264dec', 'h264enc', 'h265dec', 'h265enc'
+  ],
+  description : 'List of patent encumbered codecs to build support for. Distros might want to consult their legal department before enabling these. This is used for all video APIs (vaapi, vdpau, vulkan). Non-patent encumbered codecs will be enabled by default.'
+)
+option(
+  'gallium-d3d12-video',
+  type : 'feature',
+  value : 'auto',
+  description : 'build gallium d3d12 with video support.',
+)
+option(
+  'radv-build-id',
+  type : 'string',
+  value : '',
+  description : 'Override build id for shader cache keys (hex string). Can be extracted with readelf -x .note.gnu.build-id'
+)
+option(
+  'min-windows-version',
+  type : 'integer',
+  min : 7,
+  max : 11,
+  value : 8,
+  description : 'Minimum Windows version to support. Defaults to Windows 8.'
 )