When enabling Gallium and glx-xlib with autotools, both a "classic mesa" libGL.so.1.6.0 and a gallium libGL.so.1.5.0 get built and installed. Using the following configuration for software-only backends:
$ ./configure \
$ make install
$ ls -l /path/to/install
libGL.so -> libGL.so.1.5.0
libGL.so.1 -> libGL.so.1.6.0
libOSMesa.so -> libOSMesa.so.8.0.0
libOSMesa.so.8 -> libOSMesa.so.8.0.0
The following patch disables the 1.6.0 lib if gallium is enabled:
$ git diff
diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am
index 8dc44fd..48d14ff 100644
@@ -22,8 +22,10 @@
SUBDIRS = . main/tests
SUBDIRS += drivers/x11
SUBDIRS += drivers/dri
Fwiw I'd rather have a configure error, if one tries to build conflicting (at install time) files.
Here is how we dealt it with osmesa - any chance you can send over to mesa-dev a port for xlib libGL ?
> Fwiw I'd rather have a configure error, if one tries to build conflicting
> (at install time) files.
The glx options are implemented differently than the osmesa ones, even though they try to accomplish the same thing. The osmesa options translate to "enable classic osmesa" or "enable gallium osmesa", but the glx options, on the other hand, translate to "enable glx period, (defaulting to dri-glx)" and "use xlib-glx instead of dri-glx".
After digging through the code a bit more, I believe my patch is perhaps not the right approach. Is "classic" synonymous with dri? There seems to currently be 3 GLX implementations: dri-glx in src/glx, classic-xlib-glx in src/mesa/x11, and gallium-xlib-glx in src/gallium/state_trackers/glx/xlib. What is not clear to me now is under what situation should each of these implementations actually be built. Currently both src/mesa/x11 and state_trackers/glx/xlib are getting built, which is the root of the problem I'm trying to address. So what are the conditions then that src/mesa/x11 should be built vs when src/gallium/state_trackers/glx/xlib ? Given that I can fix the patch accordingly.
If you ignore the presence of dri powered libGL (one in src/glx) there're two libGL implementations - one 'classic' (src/mesa/foo) and one gallium (src/gallium/foo).
OSMesa is, was actually, in a similar boat. Thus to avoid the issue we added an error if one requests both of them at configure time. As miscommunication does happen, I've listed the sha(s) to illustrate what I was talking about :-)
Created attachment 122938 [details] [review]
Patch to add the --enable-gallium-xlib-glx option
So, based on our discussion, I believe I've addressed this in the attached patch now by adding an --enable-gallium-xlib-glx option to specify gallium or classic xlib-glx implementation. I gave it this behavior instead of the osmesa approach of --enable-xlib-glx and --enable-gallium-xlib-glx being competing options in order to stay consistent with how the other GLX options work; i.e. --enable-foo turns on foo with default bar1 implementation and --enable-bar2-foo changes the implementation to bar2. Invalid configurations for enabling the gallium-xlib-glx implementation will produce configure errors but there is no conflicting way to specify both classic and gallium xlib-glx implementations.
(In reply to Chuck Atkins from comment #5)
> So, based on our discussion, I believe I've addressed this in the attached
> patch now by adding an --enable-gallium-xlib-glx option to specify gallium
> or classic xlib-glx implementation. I gave it this behavior instead of the
> osmesa approach of --enable-xlib-glx and --enable-gallium-xlib-glx being
> competing options in order to stay consistent with how the other GLX options
> work; i.e. --enable-foo turns on foo with default bar1 implementation and
> --enable-bar2-foo changes the implementation to bar2. Invalid
> configurations for enabling the gallium-xlib-glx implementation will produce
> configure errors but there is no conflicting way to specify both classic and
> gallium xlib-glx implementations.
I'd rather not do that, as the current "enable foo when bar is on" feels quite magic. Sometimes it gives you a warning although in all honestly, I doubt (m)any people really look at those. I would really want to nuke them altogether and make the configure shorter and cleaner.
A bunch of comments coming in a second, but for next round please send the patch to the mesa-dev mailing list (ideally via git send-email).
> --- a/configure.ac
> +++ b/configure.ac
> @@ -930,10 +930,9 @@ AC_ARG_ENABLE([xlib-glx],
> [make GLX library Xlib-based instead of DRI-based @<:@default=disabled@:>@])],
>- [Enable optional Gallium tests) @<:@default=disabled@:>@])],
>+ [Enable optional Gallium tests @<:@default=disabled@:>@])],
Please, split this to a separate patch.
>@@ -957,6 +956,17 @@ case "$with_gallium_drivers" in
> no) with_gallium_drivers='' ;;
>+if test -n "$with_gallium_drivers" -a "x$enable_glx$enable_xlib_glx" = xyesyes; then
>+ [enable Gallium implementation of the Xlib-based GLX library @<:@default=enabled if using gallium and xlib-glx@:>@])],
I'd keep it disabled by default. Similar to its classic counterpart.
> if test "x$enable_opengl" = xno -a \
> "x$enable_gles1" = xno -a \
> "x$enable_gles2" = xno -a \
>@@ -1000,6 +1010,15 @@ fi
> if test "x$enable_opengl$enable_xlib_glx" = xnoyes; then
> AC_MSG_ERROR([Xlib-GLX cannot be built without OpenGL])
>+if test -z "$with_gallium_drivers" -a \
>+ "x$enable_gallium_xlib_glx" = xyes; then
>+ AC_MSG_ERROR([Gallium Xlib-GLX cannot be built without Gallium])
Strictly speaking one should be able to build it without explicitly requiring any gallium drivers. Although that can happen once we fix a few bugs.
>+if test "x$enable_xlib_glx$enable_gallium_xlib_glx" = xnoyes; then
wrong check - should be xyesyes
>+ AC_MSG_ERROR([Gallium Xlib-GLX cannot be built without Xlib-GLX])
and here "classic and gallium Xlib-GLX cannot be built together"
The remaining places that check enable_xlib_glx should be updated (or just nuked with preparatory patch) to attribute the gallium one as well.
The check around NEED_WINSYS_XLIB=foo should be the gallium one.
>@@ -2604,11 +2623,14 @@ if test "x$enable_dri" != xno; then
> echo " DRI driver dir: $DRI_DRIVER_INSTALL_DIR"
>-case "x$enable_glx$enable_xlib_glx" in
>+case "x$enable_glx$enable_xlib_glx$enable_gallium_xlib_glx" in
>+ echo " GLX: Xlib-based (Gallium)"
> echo " GLX: Xlib-based"
With the above suggestions this can only be xyesnono.
> echo " GLX: DRI-based"
>diff --git a/src/gallium/Makefile.am b/src/gallium/Makefile.am
>index 086e170..c4dc224 100644
>@@ -141,8 +141,10 @@ SUBDIRS += state_trackers/dri targets/dri
> if HAVE_X11_DRIVER
Drop this conditional.
> SUBDIRS += state_trackers/glx/xlib targets/libgl-xlib
> if HAVE_ST_OMX
> SUBDIRS += state_trackers/omx targets/omx
>diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am
>index 3903818..7abc7b0 100644
>@@ -22,8 +22,10 @@
> SUBDIRS = . main/tests
> if HAVE_X11_DRIVER
You don't need the extra conditional here.
Thanks for bringing this topic and working on the patch. I can realise it's not the easiest/prettiest of things ;-)
(In reply to Emil Velikov from comment #6)
> I'd rather not do that, as the current "enable foo when bar is on" feels
> quite magic. Sometimes it gives you a warning although in all honestly, I
> doubt (m)any people really look at those. I would really want to nuke them
> altogether and make the configure shorter and cleaner.
Just to be clear, before I re-work the patch, instead of enabling behavior as a set of cascading options, you'd rather see the three options as mutually exclusive at the top level, correct?
--enable-glx = enable DRI GLX
--enable-xlib-glx = enable classic Xlib GLX
--enable-gallium-xlib-glx = enable gallium Xlib GLX
> A bunch of comments coming in a second, but for next round please send the
> patch to the mesa-dev mailing list (ideally via git send-email).
I'll push the next one to the list
(In reply to Emil Velikov from comment #7)
> Thanks for bringing this topic and working on the patch. I can realise it's
> not the easiest/prettiest of things
No it's not but it's far less frustrating to fix and then not have to deal with than to always have a hacked patch that has to get applied. I'd much rather tell a customer who asks "How do I build Mesa to work with ParaView" to just download the mesa source, configure this way, and build than to tell them download mesa, apply this weird patch to the build system that you have to get from us, then configure this way and build.
As a developer at a company that produces open source software, I consider it just being a good citizen in the eco-system.
Created attachment 122974 [details] [review]
glx configure refactor: single-option verion
Created attachment 123058 [details] [review]
glx config option refactor (v3)
v3: Rebased to current master and added changelog in commit msg
Thanks a million Chuck for untangling this and sticking through the process. The fix is in master now.
on Jan 16, 2017 at 17:22:15.
(provided by the Example extension).