Mesa (master): pipe-loader: build llvmpipe on top of softpipe
Carl Worth
cworth at kemper.freedesktop.org
Tue Dec 3 22:09:10 UTC 2013
Module: Mesa
Branch: master
Commit: f60737a525fdd82c578eb3076f51a94bd63ba3b7
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f60737a525fdd82c578eb3076f51a94bd63ba3b7
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Sun Nov 17 20:07:33 2013 +0000
pipe-loader: build llvmpipe on top of softpipe
One can select if they want to fallback to softpipe.
Current approach makes this not possible, whereas other
targets (dri-swrast) handle this approapriately.
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
---
src/gallium/targets/pipe-loader/Makefile.am | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/src/gallium/targets/pipe-loader/Makefile.am b/src/gallium/targets/pipe-loader/Makefile.am
index 1c2f31b..90b5760 100644
--- a/src/gallium/targets/pipe-loader/Makefile.am
+++ b/src/gallium/targets/pipe-loader/Makefile.am
@@ -148,16 +148,6 @@ pipe_vmwgfx_la_LDFLAGS += $(LLVM_LDFLAGS)
endif
endif
-if HAVE_GALLIUM_LLVMPIPE
-pipe_LTLIBRARIES += pipe_swrast.la
-pipe_swrast_la_SOURCES = pipe_swrast.c
-nodist_EXTRA_pipe_swrast_la_SOURCES = dummy.cpp
-pipe_swrast_la_LIBADD = \
- $(PIPE_LIBS) \
- $(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la \
- $(LLVM_LIBS)
-pipe_swrast_la_LDFLAGS = -no-undefined -avoid-version -module $(LLVM_LDFLAGS)
-else
if HAVE_GALLIUM_SOFTPIPE
pipe_LTLIBRARIES += pipe_swrast.la
pipe_swrast_la_SOURCES = pipe_swrast.c
@@ -165,5 +155,12 @@ pipe_swrast_la_LIBADD = \
$(PIPE_LIBS) \
$(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la
pipe_swrast_la_LDFLAGS = -no-undefined -avoid-version -module
+if HAVE_GALLIUM_LLVMPIPE
+nodist_EXTRA_pipe_swrast_la_SOURCES = dummy.cpp
+
+pipe_swrast_la_LIBADD += \
+ $(top_builddir)/src/gallium/drivers/softpipe/libllvmpipe.la \
+ $(LLVM_LIBS)
+pipe_swrast_la_LDFLAGS += $(LLVM_LDFLAGS)
endif
endif
More information about the mesa-commit
mailing list