anv: destroy descriptor sets when pool gets destroyed

[mesa.git] / src / gallium / Makefile.am

diff --git a/src/gallium/Makefile.am b/src/gallium/Makefile.am
index ceb38b7943c29c898486b5f0f13e619d328ee248..ff69796180f8daf8b44eb03099d50bee6e1400c8 100644 (file)
--- a/src/gallium/Makefile.am
+++ b/src/gallium/Makefile.am
@@ -1,15 +1,15 @@
 SUBDIRS =
 
 ##
-## Gallium pipe drivers and their respective winsys'
+## Gallium auxiliary module
 ##
 
-SUBDIRS += \
-       drivers/galahad \
-       drivers/identity \
-       drivers/noop \
-       drivers/trace \
-       drivers/rbug
+SUBDIRS += auxiliary
+SUBDIRS += auxiliary/pipe-loader
+
+##
+## Gallium pipe drivers and their respective winsys'
+##
 
 ## freedreno/msm/kgsl
 if HAVE_GALLIUM_FREEDRENO
@@ -21,11 +21,6 @@ if HAVE_GALLIUM_I915
 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
@@ -41,11 +36,6 @@ if HAVE_GALLIUM_R300
 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
@@ -54,6 +44,7 @@ endif
 ## radeonsi
 if HAVE_GALLIUM_RADEONSI
 SUBDIRS += drivers/radeonsi
+SUBDIRS += winsys/amdgpu/drm
 endif
 
 ## the radeon winsys - linked in by r300, r600 and radeonsi
@@ -61,21 +52,48 @@ if NEED_RADEON_DRM_WINSYS
 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 NEED_GALLIUM_SOFTPIPE_DRIVER
+if HAVE_GALLIUM_SOFTPIPE
 SUBDIRS += drivers/softpipe
 
 ## swrast/llvmpipe
-if NEED_GALLIUM_LLVMPIPE_DRIVER
+if HAVE_GALLIUM_LLVMPIPE
 SUBDIRS += drivers/llvmpipe
 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
 
+## 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
 
@@ -87,67 +105,103 @@ if HAVE_DRISW
 SUBDIRS += winsys/sw/dri
 endif
 
-if HAVE_DRI2
+if HAVE_DRISW_KMS
 SUBDIRS += winsys/sw/kms-dri
 endif
 
-if HAVE_EGL_PLATFORM_FBDEV
-SUBDIRS += winsys/sw/fbdev
-endif
+SUBDIRS += winsys/sw/wrapper
 
-if HAVE_EGL_PLATFORM_WAYLAND
-SUBDIRS += winsys/sw/wayland
-endif
+##
+## Don't forget to bundle the remaining (non autotools) winsys'
+##
 
-if NEED_WINSYS_WRAPPER
-SUBDIRS += winsys/sw/wrapper
-endif
+EXTRA_DIST = \
+       docs \
+       README.portability \
+       SConscript \
+       winsys/sw/gdi \
+       winsys/sw/hgl
 
 
 ##
-## Gallium state trackers
+## Gallium state trackers and their users (targets)
 ##
 
+## XXX: Rename the conditional once we have a config switch for static/dynamic pipe-drivers
 if HAVE_CLOVER
-SUBDIRS += state_trackers/clover
+SUBDIRS += targets/pipe-loader
 endif
 
-if HAVE_DRICOMMON
-SUBDIRS += state_trackers/dri
+if HAVE_CLOVER
+SUBDIRS += state_trackers/clover targets/opencl
 endif
 
-if HAVE_GALLIUM_EGL
-SUBDIRS += state_trackers/egl
+if HAVE_DRICOMMON
+SUBDIRS += state_trackers/dri targets/dri
 endif
 
-if HAVE_GALLIUM_GBM
-SUBDIRS += state_trackers/gbm
+if HAVE_GALLIUM_XLIB_GLX
+SUBDIRS += state_trackers/glx/xlib targets/libgl-xlib
 endif
 
-if HAVE_X11_DRIVER
-SUBDIRS += state_trackers/glx/xlib
+if HAVE_ST_OMX_BELLAGIO
+SUBDIRS += state_trackers/omx targets/omx
 endif
 
-if HAVE_ST_OMX
-SUBDIRS += state_trackers/omx
+if HAVE_ST_OMX_TIZONIA
+SUBDIRS += state_trackers/omx targets/omx
 endif
 
 if HAVE_GALLIUM_OSMESA
-SUBDIRS += state_trackers/osmesa
+SUBDIRS += state_trackers/osmesa targets/osmesa
 endif
 
-if HAVE_ST_VDPAU
-SUBDIRS += state_trackers/vdpau
+if HAVE_ST_VA
+SUBDIRS += state_trackers/va targets/va
 endif
 
-if HAVE_OPENVG
-SUBDIRS += state_trackers/vega
+if HAVE_ST_VDPAU
+SUBDIRS += state_trackers/vdpau targets/vdpau
 endif
 
 if HAVE_ST_XA
-SUBDIRS += state_trackers/xa
+SUBDIRS += state_trackers/xa targets/xa
 endif
 
 if HAVE_ST_XVMC
-SUBDIRS += state_trackers/xvmc
+SUBDIRS += state_trackers/xvmc targets/xvmc
+endif
+
+if HAVE_ST_NINE
+SUBDIRS += state_trackers/nine targets/d3dadapter9
 endif
+
+##
+## Don't forget to bundle the remaining (non autotools) state-trackers/targets
+##
+
+EXTRA_DIST += \
+       include \
+       state_trackers/README \
+       state_trackers/wgl targets/libgl-gdi \
+       targets/graw-gdi targets/graw-null  targets/graw-xlib \
+       state_trackers/hgl targets/haiku-softpipe \
+       tools
+
+
+##
+## Gallium tests
+##
+
+if HAVE_GALLIUM_TESTS
+SUBDIRS += \
+       tests/trivial \
+       tests/unit
+endif
+
+EXTRA_DIST += \
+       tests/graw \
+       tests/python \
+       meson.build \
+       tests/meson.build \
+       tests/graw/meson.build