build: Add --enable-gallium-osmesa flag.
The Gallium implementation is apparently not ready for regular consumption, so as much as I hate adding more build-time options, here's another. Acked-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
parent
dded321f92
commit
2f142d596f
31
configure.ac
31
configure.ac
|
@ -580,6 +580,11 @@ AC_ARG_ENABLE([osmesa],
|
|||
[enable OSMesa library @<:@default=disabled@:>@])],
|
||||
[enable_osmesa="$enableval"],
|
||||
[enable_osmesa=no])
|
||||
AC_ARG_ENABLE([gallium-osmesa],
|
||||
[AS_HELP_STRING([--enable-gallium-osmesa],
|
||||
[enable Gallium implementation of the OSMesa library @<:@default=disabled@:>@])],
|
||||
[enable_gallium_osmesa="$enableval"],
|
||||
[enable_gallium_osmesa=no])
|
||||
AC_ARG_ENABLE([egl],
|
||||
[AS_HELP_STRING([--disable-egl],
|
||||
[disable EGL library @<:@default=enabled@:>@])],
|
||||
|
@ -770,7 +775,13 @@ if test "x$enable_dri" = xyes; then
|
|||
GALLIUM_STATE_TRACKERS_DIRS="dri $GALLIUM_STATE_TRACKERS_DIRS"
|
||||
fi
|
||||
|
||||
if test "x$enable_osmesa" = xyes; then
|
||||
if test "x$enable_gallium_osmesa" = xyes; then
|
||||
if test -z "$with_gallium_drivers"; then
|
||||
AC_MSG_ERROR([Cannot enable gallium_osmesa without Gallium])
|
||||
fi
|
||||
if test "x$enable_osmesa" = xyes; then
|
||||
AC_MSG_ERROR([Cannot enable both classic and Gallium OSMesa implementations])
|
||||
fi
|
||||
GALLIUM_STATE_TRACKERS_DIRS="osmesa $GALLIUM_STATE_TRACKERS_DIRS"
|
||||
GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS osmesa"
|
||||
fi
|
||||
|
@ -1136,7 +1147,7 @@ x16|x32)
|
|||
;;
|
||||
esac
|
||||
|
||||
if test "x$enable_osmesa" = xyes; then
|
||||
if test "x$enable_osmesa" = xyes -o "x$enable_gallium_osmesa" = xyes; then
|
||||
# only link libraries with osmesa if shared
|
||||
if test "$enable_static" = no; then
|
||||
OSMESA_LIB_DEPS="-lm $PTHREAD_LIBS $SELINUX_LIBS $DLOPEN_LIBS"
|
||||
|
@ -1962,9 +1973,11 @@ AC_SUBST([ELF_LIB])
|
|||
|
||||
AM_CONDITIONAL(NEED_LIBPROGRAM, test "x$with_gallium_drivers" != x -o \
|
||||
"x$enable_xlib_glx" = xyes -o \
|
||||
"x$enable_osmesa" = xyes)
|
||||
"x$enable_osmesa" = xyes -o \
|
||||
"x$enable_gallium_osmesa" = xyes)
|
||||
AM_CONDITIONAL(HAVE_X11_DRIVER, test "x$enable_xlib_glx" = xyes)
|
||||
AM_CONDITIONAL(HAVE_OSMESA, test "x$enable_osmesa" = xyes)
|
||||
AM_CONDITIONAL(HAVE_GALLIUM_OSMESA, test "x$enable_gallium_osmesa" = xyes)
|
||||
|
||||
AM_CONDITIONAL(HAVE_X86_ASM, echo "$DEFINES" | grep 'X86_ASM' >/dev/null 2>&1)
|
||||
AM_CONDITIONAL(HAVE_X86_64_ASM, echo "$DEFINES" | grep 'X86_64_ASM' >/dev/null 2>&1)
|
||||
|
@ -2151,11 +2164,17 @@ echo " OpenVG: $enable_openvg"
|
|||
|
||||
dnl Driver info
|
||||
echo ""
|
||||
if test "x$enable_osmesa" != xno; then
|
||||
case "x$enable_osmesa$enable_gallium_osmesa" in
|
||||
xnoyes)
|
||||
echo " OSMesa: lib$OSMESA_LIB (Gallium)"
|
||||
;;
|
||||
xyesno)
|
||||
echo " OSMesa: lib$OSMESA_LIB"
|
||||
else
|
||||
;;
|
||||
xnono)
|
||||
echo " OSMesa: no"
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
||||
if test "x$enable_dri" != xno; then
|
||||
# cleanup the drivers var
|
||||
|
|
|
@ -25,7 +25,7 @@ if HAVE_X11_DRIVER
|
|||
SUBDIRS += glx
|
||||
endif
|
||||
|
||||
if HAVE_OSMESA
|
||||
if HAVE_GALLIUM_OSMESA
|
||||
SUBDIRS += osmesa
|
||||
endif
|
||||
|
||||
|
|
|
@ -26,7 +26,7 @@ if HAVE_X11_DRIVER
|
|||
SUBDIRS += libgl-xlib
|
||||
endif
|
||||
|
||||
if HAVE_OSMESA
|
||||
if HAVE_GALLIUM_OSMESA
|
||||
SUBDIRS += osmesa
|
||||
endif
|
||||
|
||||
|
|
Loading…
Reference in New Issue