frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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@redhat.com>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
This commit is contained in:
Emil Velikov 2016-09-29 18:41:18 +01:00 committed by Adam Jackson
parent 04ef8558a7
commit 7ec350ddd4
4 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hw/xfree86/common/xf86Config.c
View File

@ -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;

2
hw/xfree86/common/xf86Privstr.h
View File

@ -86,8 +86,6 @@ typedef struct {
Bool pmFlag;
Bool disableRandR;
MessageType randRFrom;
Bool aiglx;
MessageType aiglxFrom;
MessageType iglxFrom;
XF86_GlxVisuals glxVisuals;
MessageType glxVisualsFrom;

10
hw/xfree86/dixmods/glxmodule.c
View File

@ -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);

3
hw/xfree86/man/xorg.conf.man
View File

@ -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.