[Mesa-dev] [PATCH] libgl-xlib: softpipe and llvmpipe aren't mutually exclusive at link time

[Brian Paul]

On 01/14/2013 05:28 AM, Jon TURNEY wrote:
> Since automake changes softpipe and llvmpipe are mutually exclusive at link
> time.  This doesn't make much sense to me as we can choose between them at
> run-time using GALLIUM_DRIVER.
>
> Creating library file: .libs/libGL.dll.a
> .libs/xlib.o: In function `sw_screen_create_named':
> /jhbuild/checkout/mesa/mesa/src/gallium/targets/libgl-xlib/../../../../src/gallium/auxiliary/target-helpers/inline_sw_helper.h:35:
> undefined reference to `_softpipe_create_screen'
>
> Signed-off-by: Jon TURNEY<jon.turney at dronecode.org.uk>
> ---
>   src/gallium/targets/libgl-xlib/Makefile.am |    3 +--
>   1 files changed, 1 insertions(+), 2 deletions(-)
>
> diff --git a/src/gallium/targets/libgl-xlib/Makefile.am b/src/gallium/targets/libgl-xlib/Makefile.am
> index 620ce08..e88af68 100644
> --- a/src/gallium/targets/libgl-xlib/Makefile.am
> +++ b/src/gallium/targets/libgl-xlib/Makefile.am
> @@ -47,6 +47,7 @@ libGL_la_LDFLAGS = -version-number $(GL_MAJOR):$(GL_MINOR):$(GL_TINY) -no-undefi
>   libGL_la_LIBADD = \
>   	$(top_builddir)/src/gallium/state_trackers/glx/libxlib.la \
>   	$(top_builddir)/src/gallium/winsys/sw/xlib/libws_xlib.la \
> +	$(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la \
>   	$(top_builddir)/src/gallium/drivers/trace/libtrace.la \
>   	$(top_builddir)/src/gallium/drivers/rbug/librbug.la \
>   	$(top_builddir)/src/gallium/drivers/galahad/libgalahad.la \
> @@ -59,6 +60,4 @@ if HAVE_MESA_LLVM
>   libGL_la_LIBADD += $(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la $(LLVM_LIBS)
>   AM_CPPFLAGS += -DGALLIUM_LLVMPIPE
>   libGL_la_LDFLAGS += $(LLVM_LDFLAGS)
> -else
> -libGL_la_LIBADD += $(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la
>   endif

LGTM.  Reviewed-by: Brian Paul <brianp at vmware.com>