xserver: Branch 'master' - 3 commits
Adam Jackson
ajax at kemper.freedesktop.org
Wed Oct 5 18:33:58 UTC 2016
configure.ac | 40 +++-------------------------------------
glx/Makefile.am | 11 +----------
glx/glxdriswrast.c | 6 +++---
hw/xfree86/common/xf86Config.c | 9 ---------
hw/xfree86/common/xf86Privstr.h | 2 --
hw/xfree86/dixmods/Makefile.am | 2 --
hw/xfree86/dixmods/glxmodule.c | 10 +++-------
hw/xfree86/man/xorg.conf.man | 3 ---
8 files changed, 10 insertions(+), 73 deletions(-)
New commits:
commit 501d8e2beb337e072c93c9310fcd927a099b9c3b
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Thu Sep 29 18:41:19 2016 +0100
configure.ac: remove --enable-aiglx option
Presently the option guards both direct and accelerated indirect GLX. As
such when one toggles it off they end up without any acceleration.
Remove the option all together until we have the time to split/rework
things.
Cc: Jon Turney <jon.turney at dronecode.org.uk>
Reviewed-by: Adam Jackson <ajax at redhat.com>
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
diff --git a/configure.ac b/configure.ac
index 329dc5b..f5c79ab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -595,10 +595,6 @@ AC_ARG_ENABLE(visibility, AS_HELP_STRING([--enable-visibility], [Enable symb
[SYMBOL_VISIBILITY=auto])
dnl GLX build options
-AC_ARG_ENABLE(aiglx, AS_HELP_STRING([--enable-aiglx], [Build accelerated indirect GLX (default: enabled)]),
- [AIGLX=$enableval],
- [AIGLX=yes])
-
AC_ARG_WITH(khronos-spec-dir, AS_HELP_STRING([--with-khronos-spec-dir=PATH], [Path to Khronos OpenGL registry database files (default: auto)]),
[KHRONOS_SPEC_DIR="${withval}"],
[KHRONOS_SPEC_DIR=auto])
@@ -1348,27 +1344,6 @@ if test "x$DRI" = xyes || test "x$DRI2" = xyes || test "x$DRI3" = xyes || test "
fi
fi
-if test "x$DRI2" = xyes; then
- save_CFLAGS=$CFLAGS
- CFLAGS="$CFLAGS $GL_CFLAGS $LIBDRM_CFLAGS"
- AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#include <GL/gl.h>
-#include <GL/internal/dri_interface.h>
-#ifndef __DRI_DRI2
-#error DRI2 extension not available.
-#endif]])],
- [HAVE_DRI2EXTENSION=yes],
- [HAVE_DRI2EXTENSION=no])
- CFLAGS=$save_CFLAGS
- if test "x$HAVE_DRI2EXTENSION" = xyes; then
- AC_DEFINE(DRI2_AIGLX, 1, [Build DRI2 AIGLX loader])
- DRI2_AIGLX=yes
- else
- AC_MSG_NOTICE([DRI2 AIGLX disabled, __DRI_DRI2 not defined in dri_interface.h.])
- DRI2_AIGLX=no
- fi
-fi
-AM_CONDITIONAL(DRI2_AIGLX, test "x$DRI2_AIGLX" = xyes)
-
if test "x$GLX" = xyes; then
PKG_CHECK_MODULES([XLIB], [x11])
PKG_CHECK_MODULES([GL], $GLPROTO $LIBGL)
@@ -1381,15 +1356,6 @@ else
fi
AM_CONDITIONAL(GLX, test "x$GLX" = xyes)
-if test "x$GLX" = xno; then
- AIGLX=no
-fi
-
-if test "x$AIGLX" = xyes -a \( "x$DRI2" = xyes \); then
- AC_DEFINE(AIGLX, 1, [Build AIGLX loader])
-fi
-AM_CONDITIONAL(AIGLX_DRI_LOADER, { test "x$DRI2" = xyes; } && test "x$AIGLX" = xyes)
-
AC_SUBST([GLX_DEFINES])
AC_SUBST([GLX_SYS_LIBS])
@@ -2266,8 +2232,8 @@ if test "x$XWIN" = xyes; then
AC_DEFINE(DDXOSVERRORF, 1, [Use OsVendorVErrorF])
AC_DEFINE(DDXBEFORERESET, 1, [Use ddxBeforeReset ])
-dnl XWin with AIGLX requires OpenGL spec files in order to generate wrapper code for native GL functions
- if [test "x$XWIN" = xyes && test "x$AIGLX" = xyes] ; then
+dnl XWin requires OpenGL spec files in order to generate wrapper code for native GL functions
+ if [test "x$XWIN" = xyes] ; then
AC_CHECK_PROG(PYTHON3, python3, python3)
if test -z "$PYTHON3"; then
AC_MSG_ERROR([python3 not found])
@@ -2290,7 +2256,7 @@ AM_CONDITIONAL(XWIN, [test "x$XWIN" = xyes])
AM_CONDITIONAL(XWIN_MULTIWINDOW, [test "x$XWIN" = xyes])
AM_CONDITIONAL(XWIN_MULTIWINDOWEXTWM, [test "x$XWIN" = xyes && test "x$WINDOWSWM" = xyes])
AM_CONDITIONAL(XWIN_CLIPBOARD, [test "x$XWIN" = xyes])
-AM_CONDITIONAL(XWIN_GLX_WINDOWS, [test "x$XWIN" = xyes && test "x$AIGLX" = xyes])
+AM_CONDITIONAL(XWIN_GLX_WINDOWS, [test "x$XWIN" = xyes])
AM_CONDITIONAL(XWIN_WINDOWS_DRI, [test "x$XWIN" = xyes && test "x$WINDOWSDRI" = xyes])
AM_CONDITIONAL(XWIN_RANDR, [test "x$XWIN" = xyes])
AM_CONDITIONAL(XWIN_XV, [test "x$XWIN" = xyes && test "x$XV" = xyes])
diff --git a/glx/Makefile.am b/glx/Makefile.am
index 54e8140..fc0b76a 100644
--- a/glx/Makefile.am
+++ b/glx/Makefile.am
@@ -1,8 +1,4 @@
-if AIGLX_DRI_LOADER
-GLXDRI_LIBRARY = libglxdri.la
-endif
-
-noinst_LTLIBRARIES = libglx.la $(GLXDRI_LIBRARY)
+noinst_LTLIBRARIES = libglx.la libglxdri.la
AM_CFLAGS = \
@DIX_CFLAGS@ \
@@ -23,9 +19,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/mi \
-I$(top_srcdir)/present
-if DRI2_AIGLX
AM_CPPFLAGS += -I$(top_srcdir)/hw/xfree86/dri2
-endif
indirect_sources = \
indirect_dispatch.c \
@@ -39,10 +33,7 @@ indirect_sources = \
indirect_table.c
libglxdri_la_SOURCES =
-
-if DRI2_AIGLX
libglxdri_la_SOURCES += glxdri2.c
-endif
libglxdri_la_LIBADD = $(DLOPEN_LIBS)
diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am
index dd076e4..be43e8f 100644
--- a/hw/xfree86/dixmods/Makefile.am
+++ b/hw/xfree86/dixmods/Makefile.am
@@ -29,12 +29,10 @@ libwfb_la_CFLAGS = $(AM_CFLAGS) -DFB_ACCESS_WRAPPER
libglx_la_LDFLAGS = -module -avoid-version $(LD_NO_UNDEFINED_FLAG)
libglx_la_LIBADD = $(top_builddir)/glx/libglx.la $(GLX_SYS_LIBS)
-if AIGLX_DRI_LOADER
libglx_la_LIBADD += $(top_builddir)/glx/libglxdri.la
if NO_UNDEFINED
libglx_la_LIBADD += $(LIBDRM_LIBS) $(PIXMAN_LIBS)
endif
-endif
libglx_la_SOURCES = glxmodule.c
libshadow_la_LDFLAGS = -module -avoid-version $(LD_NO_UNDEFINED_FLAG)
commit 7ec350ddd42479595f0ea88f86085af941913617
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Thu Sep 29 18:41:18 2016 +0100
xfree86: remove aiglx cmd/xorg.conf option
The option is misleading and using it leads to disabling both direct and
accelerated indirect GLX. In such cases the xserver GLX attempts to
match DRISW (IGLX) configs with the DRI2/3 ones (direct GLX) leading to
all sorts of fun experience.
Remove the option until we get a clear split and control over direct vs
indirect GLX.
Reviewed-by: Adam Jackson <ajax at redhat.com>
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index 560e2ea..21daf1a 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -710,7 +710,6 @@ typedef enum {
FLAG_LOG,
FLAG_RENDER_COLORMAP_MODE,
FLAG_RANDR,
- FLAG_AIGLX,
FLAG_IGNORE_ABI,
FLAG_ALLOW_EMPTY_INPUT,
FLAG_USE_DEFAULT_FONT_PATH,
@@ -763,8 +762,6 @@ static OptionInfoRec FlagOptions[] = {
{0}, FALSE},
{FLAG_RANDR, "RandR", OPTV_BOOLEAN,
{0}, FALSE},
- {FLAG_AIGLX, "AIGLX", OPTV_BOOLEAN,
- {0}, FALSE},
{FLAG_IGNORE_ABI, "IgnoreABI", OPTV_BOOLEAN,
{0}, FALSE},
{FLAG_USE_DEFAULT_FONT_PATH, "UseDefaultFontPath", OPTV_BOOLEAN,
@@ -917,8 +914,6 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
}
#endif
- xf86Info.aiglx = TRUE;
- xf86Info.aiglxFrom = X_DEFAULT;
#ifdef GLXEXT
xf86Info.glxVisuals = XF86_GlxVisualsTypical;
xf86Info.glxVisualsFrom = X_DEFAULT;
@@ -937,10 +932,6 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
}
}
- if (xf86GetOptValBool(FlagOptions, FLAG_AIGLX, &value)) {
- xf86Info.aiglx = value;
- xf86Info.aiglxFrom = X_CONFIG;
- }
if (xf86Info.iglxFrom != X_CMDLINE) {
if (xf86GetOptValBool(FlagOptions, FLAG_IGLX, &value)) {
enableIndirectGLX = value;
diff --git a/hw/xfree86/common/xf86Privstr.h b/hw/xfree86/common/xf86Privstr.h
index 9e327b9..c29b3cc 100644
--- a/hw/xfree86/common/xf86Privstr.h
+++ b/hw/xfree86/common/xf86Privstr.h
@@ -86,8 +86,6 @@ typedef struct {
Bool pmFlag;
Bool disableRandR;
MessageType randRFrom;
- Bool aiglx;
- MessageType aiglxFrom;
MessageType iglxFrom;
XF86_GlxVisuals glxVisuals;
MessageType glxVisualsFrom;
diff --git a/hw/xfree86/dixmods/glxmodule.c b/hw/xfree86/dixmods/glxmodule.c
index d53c665..bf7e659 100644
--- a/hw/xfree86/dixmods/glxmodule.c
+++ b/hw/xfree86/dixmods/glxmodule.c
@@ -80,13 +80,9 @@ glxSetup(void *module, void *opts, int *errmaj, int *errmin)
setupDone = TRUE;
- xf86Msg(xf86Info.aiglxFrom, "AIGLX %s\n",
- xf86Info.aiglx ? "enabled" : "disabled");
- if (xf86Info.aiglx) {
- provider = LoaderSymbol("__glXDRI2Provider");
- if (provider)
- GlxPushProvider(provider);
- }
+ provider = LoaderSymbol("__glXDRI2Provider");
+ if (provider)
+ GlxPushProvider(provider);
LoadExtensionList(GLXExt, ARRAY_SIZE(GLXExt), FALSE);
diff --git a/hw/xfree86/man/xorg.conf.man b/hw/xfree86/man/xorg.conf.man
index 94b199e..7d0c524 100644
--- a/hw/xfree86/man/xorg.conf.man
+++ b/hw/xfree86/man/xorg.conf.man
@@ -632,9 +632,6 @@ Default: PM enabled on platforms that support it.
enable or disable XINERAMA extension.
Default is disabled.
.TP 7
-.BI "Option \*qAIGLX\*q \*q" boolean \*q
-enable or disable AIGLX. AIGLX is enabled by default.
-.TP 7
.BI "Option \*qIndirectGLX\*q \*q" boolean \*q
enable or disable indirect GLX contexts. Indirect GLX contexts are disabled by
default.
commit 04ef8558a731bf070abf1b40c7e6b54aad8f5f31
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Thu Sep 29 18:41:17 2016 +0100
glx: drisw is not accelerated IGLX, reflect that in log messages
The messages from glxdricommon.c (used by drisw) still have the A, but
at least we're don't have it locally.
Reviewed-by: Adam Jackson <ajax at redhat.com>
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
diff --git a/glx/glxdriswrast.c b/glx/glxdriswrast.c
index f5c0c9f..ed0469f 100644
--- a/glx/glxdriswrast.c
+++ b/glx/glxdriswrast.c
@@ -379,7 +379,7 @@ initializeExtensions(__GLXscreen * screen)
int i;
__glXEnableExtension(screen->glx_enable_bits, "GLX_MESA_copy_sub_buffer");
- LogMessage(X_INFO, "AIGLX: enabled GLX_MESA_copy_sub_buffer\n");
+ LogMessage(X_INFO, "IGLX: enabled GLX_MESA_copy_sub_buffer\n");
if (dri->swrast->base.version >= 3) {
__glXEnableExtension(screen->glx_enable_bits,
@@ -475,7 +475,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
&screen->driConfigs, screen);
if (screen->driScreen == NULL) {
- LogMessage(X_ERROR, "AIGLX error: Calling driver entry point failed\n");
+ LogMessage(X_ERROR, "IGLX error: Calling driver entry point failed\n");
goto handle_error;
}
@@ -491,7 +491,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
__glXsetGetProcAddress(glXGetProcAddressARB);
- LogMessage(X_INFO, "AIGLX: Loaded and initialized %s\n", driverName);
+ LogMessage(X_INFO, "IGLX: Loaded and initialized %s\n", driverName);
return &screen->base;
More information about the xorg-commit
mailing list