projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pan/midgard: Share mir_nontrivial_outmod
[mesa.git]
/
meson.build
diff --git
a/meson.build
b/meson.build
index 13b561f99de821b885d6045f74d3f97cfe5b7971..f4c013a5319797a16109054277dfe6dfb6f50234 100644
(file)
--- a/
meson.build
+++ b/
meson.build
@@
-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')
@@
-315,7
+324,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
@@
-382,9
+391,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