projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
virgl: add support for ARB_multi_draw_indirect
[mesa.git]
/
src
/
gallium
/
Makefile.am
diff --git
a/src/gallium/Makefile.am
b/src/gallium/Makefile.am
index 9285037e17b5610289ddffede08adbb041fe0325..ff69796180f8daf8b44eb03099d50bee6e1400c8 100644
(file)
--- a/
src/gallium/Makefile.am
+++ b/
src/gallium/Makefile.am
@@
-5,17
+5,12
@@
SUBDIRS =
##
SUBDIRS += auxiliary
##
SUBDIRS += auxiliary
+SUBDIRS += auxiliary/pipe-loader
##
## Gallium pipe drivers and their respective winsys'
##
##
## Gallium pipe drivers and their respective winsys'
##
-SUBDIRS += \
- drivers/galahad \
- drivers/noop \
- drivers/trace \
- drivers/rbug
-
## freedreno/msm/kgsl
if HAVE_GALLIUM_FREEDRENO
SUBDIRS += drivers/freedreno winsys/freedreno/drm
## freedreno/msm/kgsl
if HAVE_GALLIUM_FREEDRENO
SUBDIRS += drivers/freedreno winsys/freedreno/drm
@@
-26,11
+21,6
@@
if HAVE_GALLIUM_I915
SUBDIRS += drivers/i915 winsys/i915/drm
endif
SUBDIRS += drivers/i915 winsys/i915/drm
endif
-## ilo/i965
-if HAVE_GALLIUM_ILO
-SUBDIRS += drivers/ilo winsys/intel/drm
-endif
-
## nouveau
if HAVE_GALLIUM_NOUVEAU
SUBDIRS += drivers/nouveau winsys/nouveau/drm
## nouveau
if HAVE_GALLIUM_NOUVEAU
SUBDIRS += drivers/nouveau winsys/nouveau/drm
@@
-46,11
+36,6
@@
if HAVE_GALLIUM_R300
SUBDIRS += drivers/r300
endif
SUBDIRS += drivers/r300
endif
-## radeon - linked into r600 and radeonsi
-if HAVE_GALLIUM_RADEON_COMMON
-SUBDIRS += drivers/radeon
-endif
-
## r600
if HAVE_GALLIUM_R600
SUBDIRS += drivers/r600
## r600
if HAVE_GALLIUM_R600
SUBDIRS += drivers/r600
@@
-59,6
+44,7
@@
endif
## radeonsi
if HAVE_GALLIUM_RADEONSI
SUBDIRS += drivers/radeonsi
## radeonsi
if HAVE_GALLIUM_RADEONSI
SUBDIRS += drivers/radeonsi
+SUBDIRS += winsys/amdgpu/drm
endif
## the radeon winsys - linked in by r300, r600 and radeonsi
endif
## the radeon winsys - linked in by r300, r600 and radeonsi
@@
-66,6
+52,14
@@
if NEED_RADEON_DRM_WINSYS
SUBDIRS += winsys/radeon/drm
endif
SUBDIRS += winsys/radeon/drm
endif
+if HAVE_GALLIUM_ETNAVIV
+SUBDIRS += drivers/etnaviv winsys/etnaviv/drm
+endif
+
+if HAVE_GALLIUM_KMSRO
+SUBDIRS += drivers/kmsro winsys/kmsro/drm
+endif
+
## swrast/softpipe
if HAVE_GALLIUM_SOFTPIPE
SUBDIRS += drivers/softpipe
## swrast/softpipe
if HAVE_GALLIUM_SOFTPIPE
SUBDIRS += drivers/softpipe
@@
-76,11
+70,30
@@
SUBDIRS += drivers/llvmpipe
endif
endif
endif
endif
+if HAVE_GALLIUM_SWR
+SUBDIRS += drivers/swr
+endif
+
+## tegra
+if HAVE_GALLIUM_TEGRA
+SUBDIRS += drivers/tegra winsys/tegra/drm
+endif
+
## vc4/rpi
if HAVE_GALLIUM_VC4
SUBDIRS += drivers/vc4 winsys/vc4/drm
endif
## vc4/rpi
if HAVE_GALLIUM_VC4
SUBDIRS += drivers/vc4 winsys/vc4/drm
endif
+## v3d
+if HAVE_GALLIUM_V3D
+SUBDIRS += drivers/v3d winsys/v3d/drm
+endif
+
+## virgl
+if HAVE_GALLIUM_VIRGL
+SUBDIRS += drivers/virgl winsys/virgl/drm winsys/virgl/vtest
+endif
+
## the sw winsys'
SUBDIRS += winsys/sw/null
## the sw winsys'
SUBDIRS += winsys/sw/null
@@
-92,7
+105,7
@@
if HAVE_DRISW
SUBDIRS += winsys/sw/dri
endif
SUBDIRS += winsys/sw/dri
endif
-if HAVE_DRI
2
+if HAVE_DRI
SW_KMS
SUBDIRS += winsys/sw/kms-dri
endif
SUBDIRS += winsys/sw/kms-dri
endif
@@
-114,7
+127,8
@@
EXTRA_DIST = \
## Gallium state trackers and their users (targets)
##
## Gallium state trackers and their users (targets)
##
-if HAVE_LOADER_GALLIUM
+## XXX: Rename the conditional once we have a config switch for static/dynamic pipe-drivers
+if HAVE_CLOVER
SUBDIRS += targets/pipe-loader
endif
SUBDIRS += targets/pipe-loader
endif
@@
-126,11
+140,15
@@
if HAVE_DRICOMMON
SUBDIRS += state_trackers/dri targets/dri
endif
SUBDIRS += state_trackers/dri targets/dri
endif
-if HAVE_
X11_DRIVER
+if HAVE_
GALLIUM_XLIB_GLX
SUBDIRS += state_trackers/glx/xlib targets/libgl-xlib
endif
SUBDIRS += state_trackers/glx/xlib targets/libgl-xlib
endif
-if HAVE_ST_OMX
+if HAVE_ST_OMX_BELLAGIO
+SUBDIRS += state_trackers/omx targets/omx
+endif
+
+if HAVE_ST_OMX_TIZONIA
SUBDIRS += state_trackers/omx targets/omx
endif
SUBDIRS += state_trackers/omx targets/omx
endif
@@
-183,4
+201,7
@@
endif
EXTRA_DIST += \
tests/graw \
EXTRA_DIST += \
tests/graw \
- tests/python
+ tests/python \
+ meson.build \
+ tests/meson.build \
+ tests/graw/meson.build