projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
llvmpipe: add compute pipeline statistics support.
[mesa.git]
/
meson.build
diff --git
a/meson.build
b/meson.build
index a210b39cd890a301db8add446a73aab1977d3f9b..501957e35e1ad3e1fc477fecedfea43e71d5f4e1 100644
(file)
--- a/
meson.build
+++ b/
meson.build
@@
-26,7
+26,7
@@
project(
).stdout(),
license : 'MIT',
meson_version : '>= 0.46',
).stdout(),
license : 'MIT',
meson_version : '>= 0.46',
- default_options : ['buildtype=debugoptimized', 'b_ndebug=if-release', 'c_std=c99', 'cpp_std=c++1
1
']
+ default_options : ['buildtype=debugoptimized', 'b_ndebug=if-release', 'c_std=c99', 'cpp_std=c++1
4
']
)
cc = meson.get_compiler('c')
)
cc = meson.get_compiler('c')
@@
-61,6
+61,8
@@
if with_tools.contains('all')
'freedreno',
'glsl',
'intel',
'freedreno',
'glsl',
'intel',
+ 'intel-ui',
+ 'lima',
'nir',
'nouveau',
'xvmc',
'nir',
'nouveau',
'xvmc',
@@
-777,6
+779,11
@@
if cc.get_id() == 'gcc' and cc.version().version_compare('< 4.4.6')
error('When using GCC, version 4.4.6 or later is required.')
endif
error('When using GCC, version 4.4.6 or later is required.')
endif
+# Support systems without ETIME (e.g. FreeBSD)
+if cc.get_define('ETIME', prefix : '#include <errno.h>') == ''
+ pre_args += '-DETIME=ETIMEDOUT'
+endif
+
# Define DEBUG for debug builds only (debugoptimized is not included on this one)
if get_option('buildtype') == 'debug'
pre_args += '-DDEBUG'
# Define DEBUG for debug builds only (debugoptimized is not included on this one)
if get_option('buildtype') == 'debug'
pre_args += '-DDEBUG'
@@
-1028,7
+1035,7
@@
elif cc.has_header_symbol('sys/mkdev.h', 'major')
pre_args += '-DMAJOR_IN_MKDEV'
endif
pre_args += '-DMAJOR_IN_MKDEV'
endif
-foreach h : ['xlocale.h', 'sys/sysctl.h', 'linux/futex.h', 'endian.h', 'dlfcn.h', 'execinfo.h', 'sys/shm.h']
+foreach h : ['xlocale.h', 'sys/sysctl.h', 'linux/futex.h', 'endian.h', 'dlfcn.h', 'execinfo.h', 'sys/shm.h'
, 'cet.h'
]
if cc.compiles('#include <@0@>'.format(h), name : '@0@'.format(h))
pre_args += '-DHAVE_@0@'.format(h.to_upper().underscorify())
endif
if cc.compiles('#include <@0@>'.format(h), name : '@0@'.format(h))
pre_args += '-DHAVE_@0@'.format(h.to_upper().underscorify())
endif
@@
-1137,6
+1144,12
@@
if dep_thread.found() and host_machine.system() != 'windows'
args : '-D_GNU_SOURCE')
pre_args += '-DHAVE_PTHREAD_SETAFFINITY'
endif
args : '-D_GNU_SOURCE')
pre_args += '-DHAVE_PTHREAD_SETAFFINITY'
endif
+ if cc.has_function(
+ 'pthread_setaffinity_np',
+ dependencies : dep_thread,
+ prefix : '#include <pthread_np.h>')
+ pre_args += '-DPTHREAD_SETAFFINITY_IN_NP_HEADER'
+ endif
endif
dep_expat = dependency('expat')
# this only exists on linux so either this is linux and it will be found, or
endif
dep_expat = dependency('expat')
# this only exists on linux so either this is linux and it will be found, or
@@
-1230,7
+1243,7
@@
if with_gallium_opencl
endif
if with_amd_vk or with_gallium_radeonsi
endif
if with_amd_vk or with_gallium_radeonsi
- _llvm_version = '>=
7
.0.0'
+ _llvm_version = '>=
8
.0.0'
elif with_gallium_swr
_llvm_version = '>= 6.0.0'
elif with_gallium_opencl or with_gallium_r600
elif with_gallium_swr
_llvm_version = '>= 6.0.0'
elif with_gallium_opencl or with_gallium_r600
@@
-1329,9
+1342,6
@@
else
endif
if with_osmesa != 'none'
endif
if with_osmesa != 'none'
- if with_osmesa == 'classic' and not with_dri_swrast
- error('OSMesa classic requires dri (classic) swrast.')
- endif
if with_osmesa == 'gallium' and not with_gallium_softpipe
error('OSMesa gallium requires gallium softpipe or llvmpipe.')
endif
if with_osmesa == 'gallium' and not with_gallium_softpipe
error('OSMesa gallium requires gallium softpipe or llvmpipe.')
endif