projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
radeonsi: set COMPUTE_DISPATCH_INITIATOR.ORDER_MODE = 1
[mesa.git]
/
src
/
Makefile.am
diff --git
a/src/Makefile.am
b/src/Makefile.am
index f1fe5157b0ac4164856a49a86ec6caaef0a0c264..df912c442af14a239e1f7a13b6517d6985f3c1b8 100644
(file)
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-28,8
+28,8
@@
git_sha1.h.tmp:
@touch git_sha1.h.tmp
@if test -e $(top_srcdir)/.git; then \
if which git > /dev/null; then \
@touch git_sha1.h.tmp
@if test -e $(top_srcdir)/.git; then \
if which git > /dev/null; then \
-
git --git-dir=$(top_srcdir)/.git log -n 1 --oneline |
\
-
sed 's/^\([^ ]*\) .*/#define MESA_GIT_SHA1 "git-\1"/'
\
+
printf '#define MESA_GIT_SHA1 "git-%s"\n'
\
+
`git --git-dir=$(top_srcdir)/.git rev-parse --short=10 HEAD`
\
> git_sha1.h.tmp ; \
fi \
fi
> git_sha1.h.tmp ; \
fi \
fi
@@
-75,6
+75,16
@@
endif
# include only conditionally ?
SUBDIRS += compiler
# include only conditionally ?
SUBDIRS += compiler
+## Optionally required by GBM, EGL and Vulkan
+if HAVE_PLATFORM_WAYLAND
+SUBDIRS += egl/wayland/wayland-drm
+endif
+
+if HAVE_VULKAN_COMMON
+SUBDIRS += vulkan
+endif
+EXTRA_DIST += vulkan/registry/vk.xml
+
if HAVE_AMD_DRIVERS
SUBDIRS += amd
endif
if HAVE_AMD_DRIVERS
SUBDIRS += amd
endif
@@
-93,11
+103,6
@@
if HAVE_DRI_GLX
SUBDIRS += glx
endif
SUBDIRS += glx
endif
-## Optionally required by GBM and EGL
-if HAVE_PLATFORM_WAYLAND
-SUBDIRS += egl/wayland/wayland-drm
-endif
-
## Optionally required by EGL (aka PLATFORM_GBM)
if HAVE_GBM
SUBDIRS += gbm
## Optionally required by EGL (aka PLATFORM_GBM)
if HAVE_GBM
SUBDIRS += gbm
@@
-112,20
+117,6
@@
if HAVE_EGL
SUBDIRS += egl
endif
SUBDIRS += egl
endif
-if HAVE_INTEL_DRIVERS
-SUBDIRS += intel/tools
-endif
-
-if HAVE_VULKAN_COMMON
-SUBDIRS += vulkan/wsi
-EXTRA_DIST += vulkan/registry/vk.xml
-endif
-
-## Requires the i965 compiler (part of mesa) and wayland-drm
-if HAVE_INTEL_VULKAN
-SUBDIRS += intel/vulkan
-endif
-
# Requires wayland-drm
if HAVE_RADEON_VULKAN
SUBDIRS += amd/vulkan
# Requires wayland-drm
if HAVE_RADEON_VULKAN
SUBDIRS += amd/vulkan