diff options
| author | Alexander von Gluck IV <[email protected]> | 2013-10-06 15:41:54 +0000 |
|---|---|---|
| committer | Alexander von Gluck IV <[email protected]> | 2013-10-10 19:28:23 -0500 |
| commit | 0fda1cb498b1308f09679b1947fd038f680dffb8 (patch) | |
| tree | e966a275b537014117fbd98c7691468b85cb3d50 /src | |
| parent | 69508950da30a1319d2a7063226c4316bfd01e3c (diff) | |
haiku: Fix llvmpipe and clean up softpipe tracing
* Fix LLVM library and defines
* Only enable tracing when scons build=debug
Acked-by: Brian Paul <[email protected]>
Diffstat (limited to 'src')
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 92ea67ab290..ba76ddaee89 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 48af2c57495..7a33cc06cda 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 3a16c3174c4..40bf03cf413 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 16752c6237c..ced22566a09 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 |