From c9223eed3c16cd3e98a8f56dda953d8f299de0e3 Mon Sep 17 00:00:00 2001 From: Jonathan Gray Date: Sun, 29 May 2016 10:22:51 +0000 Subject: Import Mesa 11.2.2 --- lib/mesa/src/gallium/Makefile.am | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'lib/mesa/src/gallium/Makefile.am') diff --git a/lib/mesa/src/gallium/Makefile.am b/lib/mesa/src/gallium/Makefile.am index e2c1090aa..e42a8f177 100644 --- a/lib/mesa/src/gallium/Makefile.am +++ b/lib/mesa/src/gallium/Makefile.am @@ -5,12 +5,14 @@ SUBDIRS = ## SUBDIRS += auxiliary +SUBDIRS += auxiliary/pipe-loader ## ## Gallium pipe drivers and their respective winsys' ## SUBDIRS += \ + drivers/ddebug \ drivers/noop \ drivers/trace \ drivers/rbug @@ -81,6 +83,11 @@ 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 @@ -92,7 +99,7 @@ if HAVE_DRISW SUBDIRS += winsys/sw/dri endif -if HAVE_DRI2 +if HAVE_DRISW_KMS SUBDIRS += winsys/sw/kms-dri endif @@ -114,7 +121,8 @@ EXTRA_DIST = \ ## 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 -- cgit v1.2.3