Commit 8aacf47e authored by Adam Jackson's avatar Adam Jackson 🎧
Browse files

glx: Remove DRI1 AIGLX (v2)

Mesa doesn't ship DRI1 drivers as of 8.0, which is about 18 months and
three releases ago.  The main reason to have wanted DRI1 AIGLX was to
get a GLX compositor working, but DRI1's (lack of) memory management API
meant that the cost of a GLX compositor was breaking direct GLX apps,
which isn't a great tradeoff.

Of the DRI1 drivers Mesa has dropped, I believe only mga stands to lose
some functionality here, since it and only it has support for
NV_texture_rectangle.  Since that's required for every extant GLX
compositor I know of, I conclude that anybody with a savage, say, would
probably not notice AIGLX going away, since they wouldn't be running a
GLX compositor in the first place.

In the future we'd like to use GL in the server in a more natural way,
as just another EGL client, including in the GLX implementation itself.
Since there's no EGL implemented for DRI1 drivers, this would already
doom AIGLX on DRI1 (short of entirely forking the GLX implementation,
which I'm not enthusiastic about).

v2: Remove DRI1 from AIGLX conditionals in [anholt]
Reviewed-by: Emma Anholt's avatarEric Anholt <>
Signed-off-by: Adam Jackson's avatarAdam Jackson <>
parent 7f5adf73
...@@ -1080,10 +1080,10 @@ if test "x$GLX" = xno; then ...@@ -1080,10 +1080,10 @@ if test "x$GLX" = xno; then
fi fi
if test "x$AIGLX" = xyes -a \( "x$DRI" = xyes -o "x$DRI2" = xyes \); then if test "x$AIGLX" = xyes -a \( "x$DRI2" = xyes \); then
AC_DEFINE(AIGLX, 1, [Build AIGLX loader]) AC_DEFINE(AIGLX, 1, [Build AIGLX loader])
fi fi
AM_CONDITIONAL(AIGLX_DRI_LOADER, { test "x$DRI" = xyes || test "x$DRI2" = xyes; } && test "x$AIGLX" = xyes) AM_CONDITIONAL(AIGLX_DRI_LOADER, { test "x$DRI2" = xyes; } && test "x$AIGLX" = xyes)
if test "x$GLX_USE_TLS" = xyes ; then if test "x$GLX_USE_TLS" = xyes ; then
...@@ -47,10 +47,6 @@ glapi_sources = \ ...@@ -47,10 +47,6 @@ glapi_sources = \
libglxdri_la_SOURCES = libglxdri_la_SOURCES =
if DRI
libglxdri_la_SOURCES += glxdri.c
libglxdri_la_SOURCES += glxdri2.c libglxdri_la_SOURCES += glxdri2.c
endif endif
This diff is collapsed.
...@@ -85,9 +85,6 @@ glxSetup(pointer module, pointer opts, int *errmaj, int *errmin) ...@@ -85,9 +85,6 @@ glxSetup(pointer module, pointer opts, int *errmaj, int *errmin)
xf86Msg(xf86Info.aiglxFrom, "AIGLX %s\n", xf86Msg(xf86Info.aiglxFrom, "AIGLX %s\n",
xf86Info.aiglx ? "enabled" : "disabled"); xf86Info.aiglx ? "enabled" : "disabled");
if (xf86Info.aiglx) { if (xf86Info.aiglx) {
provider = LoaderSymbol("__glXDRIProvider");
if (provider)
provider = LoaderSymbol("__glXDRI2Provider"); provider = LoaderSymbol("__glXDRI2Provider");
if (provider) if (provider)
GlxPushProvider(provider); GlxPushProvider(provider);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment