projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
radeonsi: move the tess factor ring size assertion to a place where it matters
[mesa.git]
/
src
/
meson.build
diff --git
a/src/meson.build
b/src/meson.build
index 19005271d733b968bde273f905827df30c074c96..d86c0ec21a6184ab4f71e06208982efe60e0d0d9 100644
(file)
--- a/
src/meson.build
+++ b/
src/meson.build
@@
-18,8
+18,8
@@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
-inc_common = include_directories(
- '.
./include', '.', 'mapi', 'mesa', 'gallium/include', 'gallium/auxiliary')
+inc_common =
[inc_include,
include_directories(
+ '.
', 'mapi', 'mesa', 'gallium/include', 'gallium/auxiliary')]
inc_mesa = include_directories('mesa')
inc_mapi = include_directories('mapi')
inc_src = include_directories('.')
inc_mesa = include_directories('mesa')
inc_mapi = include_directories('mapi')
inc_src = include_directories('.')
@@
-42,7
+42,7
@@
libglsl_util = static_library(
sha1_h = custom_target(
'git_sha1.h',
output : 'git_sha1.h',
sha1_h = custom_target(
'git_sha1.h',
output : 'git_sha1.h',
- command : [prog_python
2
, git_sha1_gen_py, '--output', '@OUTPUT@'],
+ command : [prog_python, git_sha1_gen_py, '--output', '@OUTPUT@'],
build_always : true, # commit sha1 can change without having touched these files
)
build_always : true, # commit sha1 can change without having touched these files
)
@@
-51,15
+51,32
@@
subdir('util')
subdir('mapi')
# TODO: opengl
subdir('compiler')
subdir('mapi')
# TODO: opengl
subdir('compiler')
-subdir('egl/wayland/wayland-drm')
-subdir('vulkan')
+if with_tools.contains('drm-shim')
+ subdir('drm-shim')
+endif
+subdir('imgui')
+if with_platform_wayland
+ subdir('egl/wayland/wayland-drm')
+endif
+if with_any_vk
+ subdir('vulkan')
+endif
if with_gallium_radeonsi or with_amd_vk
subdir('amd')
endif
if with_gallium_radeonsi or with_amd_vk
subdir('amd')
endif
-if with_gallium_vc4
+if with_gallium_vc4
or with_gallium_v3d
subdir('broadcom')
endif
subdir('broadcom')
endif
-if with_dri_i965 or with_intel_vk
+if with_gallium_etnaviv
+ subdir('etnaviv')
+endif
+if with_gallium_freedreno or with_freedreno_vk
+ subdir('freedreno')
+endif
+if with_gallium_panfrost or with_gallium_lima
+ subdir('panfrost')
+endif
+if with_dri_i965 or with_intel_vk or with_gallium_iris
subdir('intel')
endif
subdir('mesa')
subdir('intel')
endif
subdir('mesa')
@@
-67,7
+84,7
@@
subdir('loader')
if with_platform_haiku
subdir('hgl')
endif
if with_platform_haiku
subdir('hgl')
endif
-if with_glx
!= 'disabled
'
+if with_glx
== 'dri
'
subdir('glx')
endif
if with_gbm
subdir('glx')
endif
if with_gbm
@@
-80,6
+97,11
@@
if with_egl
endif
if with_gallium
subdir('gallium')
endif
if with_gallium
subdir('gallium')
+ # This has to be here since it requires libgallium, and subdir cannot
+ # contain ..
+ if with_tests and with_shared_glapi
+ subdir('mesa/state_tracker/tests')
+ endif
endif
# This must be after at least mesa, glx, and gallium, since libgl will be
endif
# This must be after at least mesa, glx, and gallium, since libgl will be