On 16/04/2010 17:51, Kristian Høgsberg wrote:
On Fri, Apr 16, 2010 at 11:24 AM, Jon TURNEY wrote:
Can't use --enable/disable-aiglx to control if Xwin DDX is built with AIGLX
enabled,
as at the moment it's forced off if we aren't building the X.Org DDX DRI loader
Rearrange things a bit, introducing a new configure symbol, DRI1_AIGLX to
specifically
indicate if the X.Org DDX DRI loader should be built, and replace the previous
X.Org
DDX-specific uses of AIGLX with that. As before DRI1_AIGLX is only enabled if
all of --enable-glx, --enable-aiglx and --enable-dri are
This allows the general symbol AIGLX to control if AIGLX is built for the XWin
DDX as
well
It's a bit unclear to me if --disable-aiglx is just a shorthand for
---disable-dri
and --disable-dri2, or if it's supposed to more than that?
--disable-aiglx disables the dri loaders in glx, that is the feature
of loading a dri1 or dri2 driver to accelerate indirect glx. The DRI
and DRI2 symbols control building of the DRI and DRI2 extensions found
in hw/xfree86/dri and hw/xfree86/dri2 and can be enabled even if AIGLX
is disabled.
Thanks for taking the time to look over these changes and clear up my
misunderstanding.
Perhaps DRI2_AIGLX should require DRI1_AIGLX, but I don't see anything which
enforces
that currently (and perhaps the only reason to do so is for the functions in
extension_string.c, which I want to move to make more generally available,
anyhow)...
They should be orthogonal. It should be possible to disable DRI1
AIGLX and only have DRI2 AIGLX, but I don't think the configure file
lets you do that.
Yes, this can probably be rearranged after extension_string is moved so they
are orthogonal. I'll leave that to someone else as it's not really something
I can test, though.
diff --git a/glx/Makefile.am b/glx/Makefile.am
index dcf44c7..71e7e43 100644
--- a/glx/Makefile.am
+++ b/glx/Makefile.am
@@ -1,4 +1,4 @@
-if AIGLX
+if DRI1_AIGLX
GLXDRI_LIBRARY = libglxdri.la
endif
This should remain conditional on AIGLX. Both DRI and DRI2 AIGLX use
libglxdri.la
I can't quite do that, if I want to achieve my goal of using AIGLX to mean
'turn on AIGLX on any platform', otherwise turning on AIGLX will try to build
the DRI loader, even when DRI isn't available.
Anyhow, updated patch follows which (I hope) sticks closer to the original
logic whilst introducing a new automake conditional.
_______________________________________________
[email protected]: X.Org support
Archives: http://lists.freedesktop.org/archives/xorg
Info: http://lists.freedesktop.org/mailman/listinfo/xorg
