projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
glsl: Never allow the sequence operator anywhere in an array size
[mesa.git]
/
src
/
gallium
/
Makefile.am
diff --git
a/src/gallium/Makefile.am
b/src/gallium/Makefile.am
index 32a5dc709c468f65aede16a4e07251656e330e0f..a7c3606de0abdfffaea8c061950ba6a3da4b2532 100644
(file)
--- a/
src/gallium/Makefile.am
+++ b/
src/gallium/Makefile.am
@@
-11,8
+11,7
@@
SUBDIRS += auxiliary
##
SUBDIRS += \
##
SUBDIRS += \
- drivers/galahad \
- drivers/identity \
+ drivers/ddebug \
drivers/noop \
drivers/trace \
drivers/rbug
drivers/noop \
drivers/trace \
drivers/rbug
@@
-60,6
+59,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
@@
-68,11
+68,11
@@
SUBDIRS += winsys/radeon/drm
endif
## swrast/softpipe
endif
## swrast/softpipe
-if
NEED_GALLIUM_SOFTPIPE_DRIVER
+if
HAVE_GALLIUM_SOFTPIPE
SUBDIRS += drivers/softpipe
## swrast/llvmpipe
SUBDIRS += drivers/softpipe
## swrast/llvmpipe
-if
NEED_GALLIUM_LLVMPIPE_DRIVER
+if
HAVE_GALLIUM_LLVMPIPE
SUBDIRS += drivers/llvmpipe
endif
endif
SUBDIRS += drivers/llvmpipe
endif
endif
@@
-97,24
+97,16
@@
if HAVE_DRI2
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
-
-if NEED_WINSYS_WRAPPER
SUBDIRS += winsys/sw/wrapper
SUBDIRS += winsys/sw/wrapper
-endif
##
## Don't forget to bundle the remaining (non autotools) winsys'
##
EXTRA_DIST = \
##
## Don't forget to bundle the remaining (non autotools) winsys'
##
EXTRA_DIST = \
- winsys/sw/android \
+ docs \
+ README.portability \
+ SConscript \
winsys/sw/gdi \
winsys/sw/hgl
winsys/sw/gdi \
winsys/sw/hgl
@@
-123,7
+115,7
@@
EXTRA_DIST = \
## Gallium state trackers and their users (targets)
##
## Gallium state trackers and their users (targets)
##
-if
NEED_GALLIUM_LOADER
+if
HAVE_LOADER_GALLIUM
SUBDIRS += targets/pipe-loader
endif
SUBDIRS += targets/pipe-loader
endif
@@
-135,19
+127,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
@@
-160,6
+139,10
@@
if HAVE_GALLIUM_OSMESA
SUBDIRS += state_trackers/osmesa targets/osmesa
endif
SUBDIRS += state_trackers/osmesa targets/osmesa
endif
+if HAVE_ST_VA
+SUBDIRS += state_trackers/va targets/va
+endif
+
if HAVE_ST_VDPAU
SUBDIRS += state_trackers/vdpau targets/vdpau
endif
if HAVE_ST_VDPAU
SUBDIRS += state_trackers/vdpau targets/vdpau
endif
@@
-172,11
+155,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 \