projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tgsi: use TGSI enum types in ureg code
[mesa.git]
/
src
/
gallium
/
Makefile.am
diff --git
a/src/gallium/Makefile.am
b/src/gallium/Makefile.am
index 611d55fafe224ec7411e821e45eb34f76e35d220..af010c89f8d9c513d03225395dc0ae88161c2b26 100644
(file)
--- a/
src/gallium/Makefile.am
+++ b/
src/gallium/Makefile.am
@@
-5,6
+5,7
@@
SUBDIRS =
##
SUBDIRS += auxiliary
##
SUBDIRS += auxiliary
+SUBDIRS += auxiliary/pipe-loader
##
## Gallium pipe drivers and their respective winsys'
##
## Gallium pipe drivers and their respective winsys'
@@
-26,11
+27,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,7
+42,7
@@
if HAVE_GALLIUM_R300
SUBDIRS += drivers/r300
endif
SUBDIRS += drivers/r300
endif
-## radeon - linked into r
600 and r
adeonsi
+## radeon - linked into radeonsi
if HAVE_GALLIUM_RADEON_COMMON
SUBDIRS += drivers/radeon
endif
if HAVE_GALLIUM_RADEON_COMMON
SUBDIRS += drivers/radeon
endif
@@
-67,6
+63,18
@@
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_IMX
+SUBDIRS += drivers/imx winsys/imx/drm
+endif
+
+if HAVE_GALLIUM_PL111
+SUBDIRS += drivers/pl111 winsys/pl111/drm
+endif
+
## swrast/softpipe
if HAVE_GALLIUM_SOFTPIPE
SUBDIRS += drivers/softpipe
## swrast/softpipe
if HAVE_GALLIUM_SOFTPIPE
SUBDIRS += drivers/softpipe
@@
-77,11
+85,20
@@
SUBDIRS += drivers/llvmpipe
endif
endif
endif
endif
+if HAVE_GALLIUM_SWR
+SUBDIRS += drivers/swr
+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
+## vc5
+if HAVE_GALLIUM_VC5
+SUBDIRS += drivers/vc5 winsys/vc5/drm
+endif
+
## virgl
if HAVE_GALLIUM_VIRGL
SUBDIRS += drivers/virgl winsys/virgl/drm winsys/virgl/vtest
## virgl
if HAVE_GALLIUM_VIRGL
SUBDIRS += drivers/virgl winsys/virgl/drm winsys/virgl/vtest
@@
-98,7
+115,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
@@
-120,7
+137,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
@@
-132,12
+150,12
@@
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
-SUBDIRS += state_trackers/omx
targets/omx
+if HAVE_ST_OMX
_BELLAGIO
+SUBDIRS += state_trackers/omx
_bellagio targets/omx-bellagio
endif
if HAVE_GALLIUM_OSMESA
endif
if HAVE_GALLIUM_OSMESA
@@
-189,4
+207,5
@@
endif
EXTRA_DIST += \
tests/graw \
EXTRA_DIST += \
tests/graw \
- tests/python
+ tests/python \
+ meson.build