projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mesa: add EXT_dsa glMultiTexCoordPointerEXT function
[mesa.git]
/
meson.build
diff --git
a/meson.build
b/meson.build
index 5cce7eb018a3231811a73fbf49f9a38bc2b549f6..a210b39cd890a301db8add446a73aab1977d3f9b 100644
(file)
--- a/
meson.build
+++ b/
meson.build
@@
-25,7
+25,7
@@
project(
[find_program('python', 'python2', 'python3'), 'bin/meson_get_version.py']
).stdout(),
license : 'MIT',
[find_program('python', 'python2', 'python3'), 'bin/meson_get_version.py']
).stdout(),
license : 'MIT',
- meson_version : '>= 0.4
5
',
+ meson_version : '>= 0.4
6
',
default_options : ['buildtype=debugoptimized', 'b_ndebug=if-release', 'c_std=c99', 'cpp_std=c++11']
)
default_options : ['buildtype=debugoptimized', 'b_ndebug=if-release', 'c_std=c99', 'cpp_std=c++11']
)
@@
-55,7
+55,16
@@
with_osmesa = get_option('osmesa')
with_swr_arches = get_option('swr-arches')
with_tools = get_option('tools')
if with_tools.contains('all')
with_swr_arches = get_option('swr-arches')
with_tools = get_option('tools')
if with_tools.contains('all')
- with_tools = ['etnaviv', 'freedreno', 'glsl', 'intel', 'nir', 'nouveau', 'xvmc']
+ with_tools = [
+ 'drm-shim',
+ 'etnaviv',
+ 'freedreno',
+ 'glsl',
+ 'intel',
+ 'nir',
+ 'nouveau',
+ 'xvmc',
+ ]
endif
dri_drivers_path = get_option('dri-drivers-path')
endif
dri_drivers_path = get_option('dri-drivers-path')
@@
-149,7
+158,7
@@
if gallium_drivers.contains('auto')
elif ['arm', 'aarch64'].contains(host_machine.cpu_family())
gallium_drivers = [
'kmsro', 'v3d', 'vc4', 'freedreno', 'etnaviv', 'nouveau',
elif ['arm', 'aarch64'].contains(host_machine.cpu_family())
gallium_drivers = [
'kmsro', 'v3d', 'vc4', 'freedreno', 'etnaviv', 'nouveau',
- 'tegra', 'virgl', 'lima', 'swrast'
+ 'tegra', 'virgl', 'lima', '
panfrost', '
swrast'
]
else
error('Unknown architecture @0@. Please pass -Dgallium-drivers to set driver options. Patches gladly accepted to fix this.'.format(
]
else
error('Unknown architecture @0@. Please pass -Dgallium-drivers to set driver options. Patches gladly accepted to fix this.'.format(
@@
-243,6
+252,7
@@
endif
if host_machine.system() == 'darwin'
with_dri_platform = 'apple'
if host_machine.system() == 'darwin'
with_dri_platform = 'apple'
+ pre_args += '-DBUILDING_MESA'
elif ['windows', 'cygwin'].contains(host_machine.system())
with_dri_platform = 'windows'
elif system_has_kms_drm
elif ['windows', 'cygwin'].contains(host_machine.system())
with_dri_platform = 'windows'
elif system_has_kms_drm
@@
-315,7
+325,7
@@
if with_glx == 'dri'
endif
endif
endif
endif
-if not (with_dri or with_gallium or with_glx
== 'xlib' or with_glx == 'gallium-xlib
')
+if not (with_dri or with_gallium or with_glx
!= 'disabled
')
with_gles1 = false
with_gles2 = false
with_opengl = false
with_gles1 = false
with_gles2 = false
with_opengl = false
@@
-365,7
+375,11
@@
if with_egl and not (with_platform_drm or with_platform_surfaceless or with_plat
endif
endif
endif
endif
-pre_args += '-DGLX_USE_TLS'
+# Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS.
+if not with_platform_android or get_option('platform-sdk-version') >= 29
+ pre_args += '-DUSE_ELF_TLS'
+endif
+
if with_glx != 'disabled'
if not (with_platform_x11 and with_any_opengl)
error('Cannot build GLX support without X11 platform support and at least one OpenGL API')
if with_glx != 'disabled'
if not (with_platform_x11 and with_any_opengl)
error('Cannot build GLX support without X11 platform support and at least one OpenGL API')
@@
-382,9
+396,7
@@
if with_glx != 'disabled'
error('xlib conflicts with any dri driver')
endif
elif with_glx == 'dri'
error('xlib conflicts with any dri driver')
endif
elif with_glx == 'dri'
- if not with_dri
- error('dri based GLX requires at least one DRI driver')
- elif not with_shared_glapi
+ if not with_shared_glapi
error('dri based GLX requires shared-glapi')
endif
endif
error('dri based GLX requires shared-glapi')
endif
endif
@@
-1022,12
+1034,19
@@
foreach h : ['xlocale.h', 'sys/sysctl.h', 'linux/futex.h', 'endian.h', 'dlfcn.h'
endif
endforeach
endif
endforeach
-foreach f : ['strtof', 'mkostemp', 'posix_memalign', 'timespec_get', 'memfd_create']
+foreach f : ['strtof', 'mkostemp', 'posix_memalign', 'timespec_get', 'memfd_create'
, 'random_r'
]
if cc.has_function(f)
pre_args += '-DHAVE_@0@'.format(f.to_upper())
endif
endforeach
if cc.has_function(f)
pre_args += '-DHAVE_@0@'.format(f.to_upper())
endif
endforeach
+if cc.has_header_symbol('errno.h', 'program_invocation_name',
+ args : '-D_GNU_SOURCE')
+ pre_args += '-DHAVE_PROGRAM_INVOCATION_NAME'
+elif with_tools.contains('intel')
+ error('Intel tools require the program_invocation_name variable')
+endif
+
# strtod locale support
if cc.links('''
#define _GNU_SOURCE
# strtod locale support
if cc.links('''
#define _GNU_SOURCE
@@
-1133,7
+1152,7
@@
dep_libdrm_radeon = null_dep
dep_libdrm_nouveau = null_dep
dep_libdrm_intel = null_dep
dep_libdrm_nouveau = null_dep
dep_libdrm_intel = null_dep
-_drm_amdgpu_ver = '2.4.9
7
'
+_drm_amdgpu_ver = '2.4.9
9
'
_drm_radeon_ver = '2.4.71'
_drm_nouveau_ver = '2.4.66'
_drm_intel_ver = '2.4.75'
_drm_radeon_ver = '2.4.71'
_drm_nouveau_ver = '2.4.66'
_drm_intel_ver = '2.4.75'
@@
-1482,10
+1501,6
@@
endif
pkg = import('pkgconfig')
prog_nm = find_program('nm', required : false)
pkg = import('pkgconfig')
prog_nm = find_program('nm', required : false)
-env_test = environment()
-if prog_nm.found()
- env_test.set('NM', prog_nm.path())
-endif
# This quirk needs to be applied to sources with functions defined in assembly
# as GCC LTO drops them. See: https://bugs.freedesktop.org/show_bug.cgi?id=109391
# This quirk needs to be applied to sources with functions defined in assembly
# as GCC LTO drops them. See: https://bugs.freedesktop.org/show_bug.cgi?id=109391