Mesa (master): haiku: Fix llvmpipe and clean up softpipe tracing

[Alexander von Gluck IV]

Module: Mesa
Branch: master
Commit: 0fda1cb498b1308f09679b1947fd038f680dffb8
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0fda1cb498b1308f09679b1947fd038f680dffb8

Author: Alexander von Gluck IV <kallisti5 at unixzen.com>
Date:   Sun Oct  6 15:41:54 2013 +0000

haiku: Fix llvmpipe and clean up softpipe tracing

* Fix LLVM library and defines
* Only enable tracing when scons build=debug

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

---

 .../targets/haiku-softpipe/GalliumContext.cpp      |    3 +--
 .../targets/haiku-softpipe/GalliumFramebuffer.cpp  |    3 +--
 src/gallium/targets/haiku-softpipe/SConscript      |    5 +++--
 .../targets/haiku-softpipe/SoftwareRenderer.cpp    |    3 +--
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/gallium/targets/haiku-softpipe/GalliumContext.cpp b/src/gallium/targets/haiku-softpipe/GalliumContext.cpp
index 92ea67a..ba76dda 100644
--- a/src/gallium/targets/haiku-softpipe/GalliumContext.cpp
+++ b/src/gallium/targets/haiku-softpipe/GalliumContext.cpp
@@ -32,8 +32,7 @@ extern "C" {
 }
 
 
-#define TRACE_CONTEXT
-#ifdef TRACE_CONTEXT
+#ifdef DEBUG
 #	define TRACE(x...) printf("GalliumContext: " x)
 #	define CALLED() TRACE("CALLED: %s\n", __PRETTY_FUNCTION__)
 #else
diff --git a/src/gallium/targets/haiku-softpipe/GalliumFramebuffer.cpp b/src/gallium/targets/haiku-softpipe/GalliumFramebuffer.cpp
index 48af2c5..7a33cc0 100644
--- a/src/gallium/targets/haiku-softpipe/GalliumFramebuffer.cpp
+++ b/src/gallium/targets/haiku-softpipe/GalliumFramebuffer.cpp
@@ -18,8 +18,7 @@ extern "C" {
 }
 
 
-#define TRACE_FRAMEBUFFER
-#ifdef TRACE_FRAEMBUFFER
+#ifdef DEBUG
 #   define TRACE(x...) printf("GalliumFramebuffer: " x)
 #   define CALLED() TRACE("CALLED: %s\n", __PRETTY_FUNCTION__)
 #else
diff --git a/src/gallium/targets/haiku-softpipe/SConscript b/src/gallium/targets/haiku-softpipe/SConscript
index 3a16c31..40bf03c 100644
--- a/src/gallium/targets/haiku-softpipe/SConscript
+++ b/src/gallium/targets/haiku-softpipe/SConscript
@@ -26,7 +26,8 @@ env.Append(CPPPATH = [
 ])
 
 if env['llvm']:
-    env.Append(CPPDEFINES = 'HAVE_LLVMPIPE')
+    env.Append(CPPDEFINES = ['GALLIUM_LLVMPIPE'])
+    env.Prepend(LIBS = [llvmpipe])
 
 softpipe_sources = [
     'GalliumContext.cpp',
@@ -34,7 +35,7 @@ softpipe_sources = [
     'SoftwareRenderer.cpp'
 ]
 
-# libswpipe gets turned into "Software Renderer" by the haiku package system
+# libswpipe gets turned into "Softpipe" by the haiku package system
 module = env.LoadableModule(
     target ='swpipe',
     source = softpipe_sources,
diff --git a/src/gallium/targets/haiku-softpipe/SoftwareRenderer.cpp b/src/gallium/targets/haiku-softpipe/SoftwareRenderer.cpp
index 16752c6..ced2256 100644
--- a/src/gallium/targets/haiku-softpipe/SoftwareRenderer.cpp
+++ b/src/gallium/targets/haiku-softpipe/SoftwareRenderer.cpp
@@ -21,8 +21,7 @@
 #include <new>
 
 
-#define TRACE_SOFTWARE
-#ifdef TRACE_SOFTWARE
+#ifdef DEBUG
 #	define TRACE(x...) printf("SoftwareRenderer: " x)
 #	define CALLED() TRACE("CALLED: %s\n", __PRETTY_FUNCTION__)
 #else