projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
radeonsi: add nir include paths
[mesa.git]
/
src
/
gallium
/
Makefile.am
diff --git
a/src/gallium/Makefile.am
b/src/gallium/Makefile.am
index f6bf3c0057584f164ab271eaf7f72d716fdabdef..9f98a7e28b6ea747db7521524e1dc03dddefd115 100644
(file)
--- a/
src/gallium/Makefile.am
+++ b/
src/gallium/Makefile.am
@@
-5,13
+5,14
@@
SUBDIRS =
##
SUBDIRS += auxiliary
##
SUBDIRS += auxiliary
+SUBDIRS += auxiliary/pipe-loader
##
## Gallium pipe drivers and their respective winsys'
##
SUBDIRS += \
##
## Gallium pipe drivers and their respective winsys'
##
SUBDIRS += \
- drivers/
galahad
\
+ drivers/
ddebug
\
drivers/noop \
drivers/trace \
drivers/rbug
drivers/noop \
drivers/trace \
drivers/rbug
@@
-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
@@
-59,6
+55,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
+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
@@
-76,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
+## 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,18
+110,10
@@
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
-if HAVE_EGL_PLATFORM_FBDEV
-SUBDIRS += winsys/sw/fbdev
-endif
-
-if HAVE_EGL_PLATFORM_WAYLAND
-SUBDIRS += winsys/sw/wayland
-endif
-
SUBDIRS += winsys/sw/wrapper
##
SUBDIRS += winsys/sw/wrapper
##
@@
-114,10
+124,6
@@
EXTRA_DIST = \
docs \
README.portability \
SConscript \
docs \
README.portability \
SConscript \
- state_trackers/egl \
- state_trackers/gbm \
- targets/egl-static \
- targets/gbm \
winsys/sw/gdi \
winsys/sw/hgl
winsys/sw/gdi \
winsys/sw/hgl
@@
-126,7
+132,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
@@
-138,12
+145,7
@@
if HAVE_DRICOMMON
SUBDIRS += state_trackers/dri targets/dri
endif
SUBDIRS += state_trackers/dri targets/dri
endif
-## the egl target depends on vega
-if HAVE_OPENVG
-SUBDIRS += state_trackers/vega
-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