Fix Xephyr compilation without GLX.
This commit is contained in:
parent
1f83f40525
commit
315d6a2b1d
|
@ -1901,7 +1901,7 @@ if test "$KDRIVE" = yes; then
|
||||||
XEPHYR=$xephyr
|
XEPHYR=$xephyr
|
||||||
fi
|
fi
|
||||||
XEPHYR_DRI=no
|
XEPHYR_DRI=no
|
||||||
if test x$XEPHYR = xyes -a x$DRI = xyes; then
|
if test x$XEPHYR = xyes -a x$DRI = xyes && test "x$GLX" = xyes; then
|
||||||
XEPHYR_DRI=yes
|
XEPHYR_DRI=yes
|
||||||
XEPHYR_DRI_LIBS=-lGL
|
XEPHYR_DRI_LIBS=-lGL
|
||||||
AC_SUBST(XEPHYR_DRI_LIBS)
|
AC_SUBST(XEPHYR_DRI_LIBS)
|
||||||
|
|
|
@ -635,7 +635,9 @@ ephyrInitScreen (ScreenPtr pScreen)
|
||||||
if (!ephyrNoDRI && !hostx_has_dri ()) {
|
if (!ephyrNoDRI && !hostx_has_dri ()) {
|
||||||
EPHYR_LOG ("host x does not support DRI. Disabling DRI forwarding\n") ;
|
EPHYR_LOG ("host x does not support DRI. Disabling DRI forwarding\n") ;
|
||||||
ephyrNoDRI = TRUE ;
|
ephyrNoDRI = TRUE ;
|
||||||
|
#ifdef GLXEXT
|
||||||
noGlxVisualInit = FALSE ;
|
noGlxVisualInit = FALSE ;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
if (!ephyrNoDRI) {
|
if (!ephyrNoDRI) {
|
||||||
ephyrDRIExtensionInit (pScreen) ;
|
ephyrDRIExtensionInit (pScreen) ;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user