diff options
| author | Emil Velikov <[email protected]> | 2013-11-17 20:07:33 +0000 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2013-12-03 21:44:26 +0000 |
| commit | f60737a525fdd82c578eb3076f51a94bd63ba3b7 (patch) | |
| tree | 6fcfdcecd9f831611280684a09055d557ef31049 | |
| parent | bc2627a98a07ebb5f279add74fac5b88349f2fa9 (diff) | |
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 <[email protected]>
| -rw-r--r-- | 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 1c2f31bc681..90b5760421f 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 |