projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
targets/nine: remove vc4 target
[mesa.git]
/
src
/
gallium
/
Makefile.am
diff --git
a/src/gallium/Makefile.am
b/src/gallium/Makefile.am
index 21595a1aaf0901698708a8ffb5106a644fd88f8d..e42a8f17703bd2db0cf77fa8a088fb8884115bb7 100644
(file)
--- a/
src/gallium/Makefile.am
+++ b/
src/gallium/Makefile.am
@@
-5,14
+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/identity \
+ drivers/ddebug \
drivers/noop \
drivers/trace \
drivers/rbug
drivers/noop \
drivers/trace \
drivers/rbug
@@
-60,6
+60,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
@@
-82,6
+83,11
@@
if HAVE_GALLIUM_VC4
SUBDIRS += drivers/vc4 winsys/vc4/drm
endif
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
@@
-93,18
+99,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
##
@@
-112,7
+110,9
@@
SUBDIRS += winsys/sw/wrapper
##
EXTRA_DIST = \
##
EXTRA_DIST = \
- winsys/sw/android \
+ docs \
+ README.portability \
+ SConscript \
winsys/sw/gdi \
winsys/sw/hgl
winsys/sw/gdi \
winsys/sw/hgl
@@
-121,7
+121,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
@@
-133,19
+134,6
@@
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_GALLIUM_EGL
-SUBDIRS += state_trackers/egl targets/egl-static
-endif
-
-if HAVE_GALLIUM_GBM
-SUBDIRS += state_trackers/gbm targets/gbm
-endif
-
if HAVE_X11_DRIVER
SUBDIRS += state_trackers/glx/xlib targets/libgl-xlib
endif
if HAVE_X11_DRIVER
SUBDIRS += state_trackers/glx/xlib targets/libgl-xlib
endif
@@
-174,11
+162,16
@@
if HAVE_ST_XVMC
SUBDIRS += state_trackers/xvmc targets/xvmc
endif
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 += \
##
## 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/README \
state_trackers/wgl targets/libgl-gdi \
targets/graw-gdi targets/graw-null targets/graw-xlib \