patch dat meson.build

Author: SolDev69

meson.build

@@ -6,7 +6,7 @@ project(
   ['c', 'cpp'],
   version : files('VERSION'),
   license : 'MIT',
-  meson_version : '>= 1.3.0',
+  meson_version : '>= 1.1.0',
   default_options : [
     'buildtype=debugoptimized',
     'b_ndebug=if-release',
@@ -44,22 +44,6 @@ with_mesa_debug = get_option('buildtype') == 'debug'
 # This means the final value of b_ndebug==true
 with_mesa_ndebug = get_option('b_ndebug') == 'true' or (get_option('buildtype') == 'release' and get_option('b_ndebug') == 'if-release')
 
-# We need to set -fmacro-prefix-map properly for driver CL reproducability.
-relative_dir = fs.relative_to(meson.global_source_root(), meson.global_build_root())
-
-cl_args = [
-  '-fmacro-prefix-map=@0@/='.format(relative_dir),
-
-  # Set the OpenCL standard to CL 2.0, enabling everything at a frontend.
-  # Drivers may not actually support everything but that's ok.
-  '-cl-std=cl2.0',
-  '-D__OPENCL_VERSION__=200'
-]
-
-if with_mesa_ndebug
-  cl_args += ['-DNDEBUG']
-endif
-
 # Arguments for the preprocessor, put these in a separate array from the C and
 # C++ (cpp in meson terminology) arguments since they need to be added to the
 # default arguments for both C and C++.
@@ -80,10 +64,10 @@ with_moltenvk_dir = get_option('moltenvk-dir')
 with_vulkan_icd_dir = get_option('vulkan-icd-dir')
 with_tests = get_option('build-tests')
 with_glcpp_tests = get_option('enable-glcpp-tests')
-with_radv_tests = get_option('build-radv-tests')
 with_aco_tests = get_option('build-aco-tests')
 with_glx_read_only_text = get_option('glx-read-only-text')
 with_glx_direct = get_option('glx-direct')
+with_osmesa = get_option('osmesa')
 with_vulkan_overlay_layer = get_option('vulkan-layers').contains('overlay')
 with_vulkan_device_select_layer = get_option('vulkan-layers').contains('device-select')
 with_vulkan_screenshot_layer = get_option('vulkan-layers').contains('screenshot')
@@ -120,15 +104,28 @@ if gbm_backends_path == ''
   gbm_backends_path = join_paths(get_option('prefix'), get_option('libdir'), 'gbm')
 endif
 
+# Default shared glapi disabled for windows, enabled elsewhere.
+with_shared_glapi = get_option('shared-glapi') \
+  .disable_auto_if(host_machine.system() == 'windows') \
+  .allowed()
+
 with_opengl = get_option('opengl')
-with_gles1 = get_option('gles1').allowed()
-with_gles2 = get_option('gles2').allowed()
+
+with_gles1 = get_option('gles1') \
+  .require(with_shared_glapi, error_message : 'OpengGL ES 1.x requires shared-glapi') \
+  .allowed()
+
+with_gles2 = get_option('gles2') \
+  .require(with_shared_glapi, error_message : 'OpengGL ES 2.x requires shared-glapi') \
+  .allowed()
 
 pre_args += '-DHAVE_OPENGL=@0@'.format(with_opengl.to_int())
 pre_args += '-DHAVE_OPENGL_ES_1=@0@'.format(with_gles1.to_int())
 pre_args += '-DHAVE_OPENGL_ES_2=@0@'.format(with_gles2.to_int())
 
 with_any_opengl = with_opengl or with_gles1 or with_gles2
+# Only build shared_glapi if at least one OpenGL API is enabled
+with_shared_glapi = with_shared_glapi and with_any_opengl
 
 system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', 'dragonfly', 'linux', 'sunos', 'android', 'managarm'].contains(host_machine.system())
 
@@ -168,22 +165,30 @@ if gallium_drivers.contains('auto')
           host_machine.system()))
   endif
 elif gallium_drivers.contains('all')
+   # Build-test everything except for i915, which depends on libdrm-intel which
+   # is not available on non-Intel distros.
    gallium_drivers = [
-     'r300', 'r600', 'radeonsi', 'crocus', 'v3d', 'vc4', 'freedreno', 'etnaviv', 'i915',
+     'r300', 'r600', 'radeonsi', 'crocus', 'v3d', 'vc4', 'freedreno', 'etnaviv',
      'nouveau', 'svga', 'tegra', 'virgl', 'lima', 'panfrost', 'llvmpipe', 'softpipe', 'iris',
      'zink', 'd3d12', 'asahi'
    ]
 endif
 
+# compatibility for meson configurations asking for 'swrast'
+with_swrast = gallium_drivers.contains('swrast')
+if with_swrast
+  warning('`gallium-drivers=swrast` is a deprecated alias for `gallium-drivers=softpipe,llvmpipe` and will be removed in version 25.0')
+endif
+
 with_amdgpu_virtio = get_option('amdgpu-virtio')
 
 with_gallium_radeonsi = gallium_drivers.contains('radeonsi')
 with_gallium_r300 = gallium_drivers.contains('r300')
 with_gallium_r600 = gallium_drivers.contains('r600')
 with_gallium_nouveau = gallium_drivers.contains('nouveau')
 with_gallium_freedreno = gallium_drivers.contains('freedreno')
-with_gallium_softpipe = gallium_drivers.contains('softpipe')
-with_gallium_llvmpipe = gallium_drivers.contains('llvmpipe')
+with_gallium_softpipe = with_swrast or gallium_drivers.contains('softpipe')
+with_gallium_llvmpipe = with_swrast or gallium_drivers.contains('llvmpipe')
 with_gallium_vc4 = gallium_drivers.contains('vc4')
 with_gallium_v3d = gallium_drivers.contains('v3d')
 with_gallium_panfrost = gallium_drivers.contains('panfrost')
@@ -225,7 +230,7 @@ if _vulkan_drivers.contains('auto')
     if host_machine.cpu_family().startswith('x86')
       _vulkan_drivers = ['amd', 'intel', 'intel_hasvk', 'nouveau', 'swrast']
     elif ['arm', 'aarch64'].contains(host_machine.cpu_family())
-      _vulkan_drivers = ['swrast', 'intel', 'panfrost', 'freedreno']
+      _vulkan_drivers = ['swrast', 'intel', 'panfrost']
     elif ['mips', 'mips64', 'ppc', 'ppc64', 'riscv32', 'riscv64'].contains(host_machine.cpu_family())
       _vulkan_drivers = ['amd', 'swrast']
     elif ['loongarch64'].contains(host_machine.cpu_family())
@@ -344,9 +349,6 @@ endif
 if with_aco_tests and not with_amd_vk
   error('ACO tests require Radv')
 endif
-if with_radv_tests and not with_amd_vk
-  error('RADV tests require RADV')
-endif
 
 with_microsoft_clc = get_option('microsoft-clc').enabled()
 with_spirv_to_dxil = get_option('spirv-to-dxil')
@@ -382,7 +384,13 @@ all_codecs = patent_codecs + free_codecs
 if _codecs.contains('all')
   _codecs = all_codecs
 elif _codecs.contains('all_free')
-  _codecs += free_codecs
+  selected_codecs = _codecs
+  _codecs = free_codecs
+  foreach c : patent_codecs
+    if selected_codecs.contains(c)
+      _codecs += c
+    endif
+  endforeach
 endif
 foreach c : all_codecs
    pre_args += '-DVIDEO_CODEC_@0@=@1@'.format(c.to_upper(), _codecs.contains(c).to_int())
@@ -452,6 +460,7 @@ if not (with_dri or with_gallium or with_glx != 'disabled')
   with_gles2 = false
   with_opengl = false
   with_any_opengl = false
+  with_shared_glapi = false
 endif
 
 with_gbm = get_option('gbm') \
@@ -465,6 +474,7 @@ with_xlib_lease = get_option('xlib-lease') \
 
 with_egl = get_option('egl') \
   .require(with_platform_windows or with_platform_haiku or with_dri or with_platform_android, error_message : 'EGL requires DRI, Haiku, Windows or Android') \
+  .require(with_shared_glapi, error_message : 'EGL requires shared-glapi') \
   .require(with_glx != 'xlib', error_message :'EGL requires DRI, but GLX is being built with xlib support') \
   .disable_auto_if(with_platform_haiku) \
   .allowed()
@@ -554,6 +564,10 @@ if with_glx != 'disabled'
     elif with_dri
       error('xlib conflicts with any dri driver')
     endif
+  elif with_glx == 'dri'
+    if not with_shared_glapi
+      error('dri based GLX requires shared-glapi')
+    endif
   endif
 endif
 
@@ -696,7 +710,6 @@ endif
 
 with_gallium_st_nine =  get_option('gallium-nine')
 if with_gallium_st_nine
-  warning('The nine state tracker will be removed in Mesa 25.2')
   if not with_gallium_swrast
     error('The nine state tracker requires gallium softpipe/llvmpipe.')
   elif not [
@@ -721,18 +734,27 @@ if with_gallium_st_d3d10umd
     error('The d3d10umd state tracker requires gallium softpipe/llvmpipe.')
   endif
 endif
-
-if host_machine.cpu_family() == 'ppc64' and host_machine.endian() == 'little'
-  if cc.compiles('''
-      #include <altivec.h>
-      int main() {
-        vector unsigned char r;
-        vector unsigned int v = vec_splat_u32 (1);
-        r = __builtin_vec_vgbbd ((vector unsigned char) v);
-        return 0;
-      }''',
-      name : 'POWER8 intrinsics')
-    pre_args += ['-D_ARCH_PWR8']
+_power8 = get_option('power8')
+if _power8.allowed()
+  if host_machine.cpu_family() == 'ppc64' and host_machine.endian() == 'little'
+    if cc.get_id() == 'gcc' and cc.version().version_compare('< 4.8')
+      error('Altivec is not supported with gcc version < 4.8.')
+    endif
+    if cc.compiles('''
+        #include <altivec.h>
+        int main() {
+          vector unsigned char r;
+          vector unsigned int v = vec_splat_u32 (1);
+          r = __builtin_vec_vgbbd ((vector unsigned char) v);
+          return 0;
+        }''',
+        args : '-mpower8-vector',
+        name : 'POWER8 intrinsics')
+      pre_args += ['-D_ARCH_PWR8']
+      c_cpp_args += '-mpower8-vector'
+    elif _power8.enabled()
+      error('POWER8 intrinsic support required but not found.')
+    endif
   endif
 endif
 
@@ -810,22 +832,17 @@ else
   with_drivers_clc = false
 endif
 
-with_driver_using_cl = [
-  with_gallium_iris, with_intel_vk,
-  with_gallium_asahi, with_asahi_vk,
-  with_gallium_panfrost, with_panfrost_vk,
-  with_nouveau_vk,
-].contains(true)
-
 if get_option('mesa-clc') == 'system'
   prog_mesa_clc = find_program('mesa_clc', native : true)
-  prog_vtn_bindgen2 = find_program('vtn_bindgen2', native : true)
+  prog_vtn_bindgen = find_program('vtn_bindgen', native : true)
   # Even with mesa-clc already built, rusticl still needs clc.
   with_clc = with_gallium_rusticl
 else
   with_clc = get_option('mesa-clc') != 'auto' or \
-             with_microsoft_clc or with_gallium_rusticl or \
-             with_drivers_clc or with_driver_using_cl
+             with_microsoft_clc or with_drivers_clc or \
+             with_gallium_iris or with_intel_vk or \
+             with_gallium_asahi or with_asahi_vk or \
+             with_gallium_rusticl
 endif
 
 dep_clc = null_dep
@@ -861,7 +878,7 @@ if with_platform_x11
 endif
 
 with_glapi_export_proto_entry_points = false
-if not with_glx_indirect_rendering
+if with_shared_glapi and not with_glx_indirect_rendering
   # Imply !defined(GLX_INDIRECT_RENDERING)
   with_glapi_export_proto_entry_points = true
 endif
@@ -1085,7 +1102,6 @@ if cc.get_argument_syntax() == 'msvc'
     '/we4024',  # Error when passing different type of parameter
     '/we4189',  # 'identifier' : local variable is initialized but not referenced
     '/Zc:__cplusplus', #Set __cplusplus macro to match the /std:c++<version> on the command line
-    '/Zc:preprocessor', # Use the standards-conforming preprocessor
   ]
   c_args += cc.get_supported_arguments(_trial)
   cpp_args += cpp.get_supported_arguments(_trial)
@@ -1546,6 +1562,10 @@ if with_any_intel and ['x86', 'x86_64'].contains(host_machine.cpu_family())
   pre_args += '-DSUPPORT_INTEL_INTEGRATED_GPUS'
 endif
 
+if with_gallium_i915 and host_machine.cpu_family().startswith('x86') == false
+  error('Intel "i915" Gallium driver requires x86 or x86_64 CPU family')
+endif
+
 # Determine whether or not the rt library is needed for time functions
 if host_machine.system() == 'windows' or cc.has_function('clock_gettime')
   dep_clock = null_dep
@@ -1746,9 +1766,7 @@ amd_with_llvm = get_option('amd-use-llvm')
 llvm_has_mcjit = host_machine.cpu_family() in ['aarch64', 'arm', 'ppc', 'ppc64', 's390x', 'x86', 'x86_64']
 llvm_with_orcjit = get_option('llvm-orcjit') or not llvm_has_mcjit
 
-if with_amd_vk or with_gallium_radeonsi
-  _llvm_version = '>= 18.0.0'
-elif with_clc or llvm_with_orcjit
+if with_amd_vk or with_gallium_radeonsi or with_clc or llvm_with_orcjit
   _llvm_version = '>= 15.0.0'
 elif with_gallium_clover
   _llvm_version = '>= 11.0.0'
@@ -1869,7 +1887,7 @@ endif
 dep_spirv_tools = dependency(
   'SPIRV-Tools',
   required : with_clc,
-  version : '>= 2024.1'
+  version : '>= 2022.1'
 )
 if dep_spirv_tools.found()
   pre_args += '-DHAVE_SPIRV_TOOLS'
@@ -2019,6 +2037,17 @@ if dep_unwind.found()
   pre_args += '-DHAVE_LIBUNWIND'
 endif
 
+if with_osmesa
+  # if not with_gallium_swrast
+  #   error('OSMesa gallium requires gallium softpipe or llvmpipe.')
+  # endif
+  if host_machine.system() == 'windows'
+    osmesa_lib_name = 'osmesa'
+  else
+    osmesa_lib_name = 'OSMesa'
+  endif
+endif
+
 # TODO: symbol mangling
 
 if with_platform_wayland
@@ -2029,7 +2058,7 @@ if with_platform_wayland
   else
     wl_scanner_arg = 'code'
   endif
-  dep_wl_protocols = dependency('wayland-protocols', version : '>= 1.41', default_options: [ 'tests=false' ])
+  dep_wl_protocols = dependency('wayland-protocols', version : '>= 1.38', default_options: [ 'tests=false' ])
   dep_wayland_client = dependency('wayland-client', version : '>=1.18')
   dep_wayland_server = dependency('wayland-server', version : '>=1.18')
   if with_egl
@@ -2317,6 +2346,7 @@ summary(
     'OpenGL': with_opengl,
     'ES1': with_gles1,
     'ES2': with_gles2,
+    'Shared glapi': with_shared_glapi,
     'GLVND': with_glvnd,
   },
   section: 'OpenGL', bool_yn: true
@@ -2357,7 +2387,7 @@ summary(egl_summary, section: 'EGL', bool_yn: true, list_sep: ' ')
 
 gbm_summary = {'Enabled': with_gbm}
 if with_gbm
-  gbm_summary += {'External libgbm': get_option('libgbm-external'), 'Backends path': gbm_backends_path}
+  gbm_summary += {'Backends path': gbm_backends_path}
 endif
 summary(gbm_summary, section: 'GBM', bool_yn: true, list_sep: ' ')
 
@@ -2384,7 +2414,6 @@ if with_any_vk
   video_apis += 'vulkan'
 endif
 if with_gallium_xa
-  warning('XA will be removed in Mesa 25.2')
   video_apis += 'xa'
 endif
 video_summary += {'APIs': video_apis.length() != 0 ? video_apis : false}
@@ -2421,6 +2450,7 @@ if with_gallium
     gallium_frontends += 'rusticl'
   endif
   gallium_summary += {'Frontends': gallium_frontends}
+  gallium_summary += {'Off-screen rendering (OSMesa)': with_osmesa ? 'lib' + osmesa_lib_name : false}
   gallium_summary += {'HUD lm-sensors': dep_lmsensors.found()}
 endif
 summary(gallium_summary, section: 'Gallium', bool_yn: true, list_sep: ' ')