[Mesa-dev] [PATCH 2/2] haiku: Fix llvmpipe and clean up tracing

[Brian Paul]

The subject says llvmpipe but the changes appear to be for softpipe.
And it looks like this would ideally be split into two separate commits.

Anyway, for 1 and 2: Acked-by: Brian Paul <brianp at vmware.com>


On 10/09/2013 05:47 PM, Alexander von Gluck IV wrote:
> * Fix LLVM library and defines
> * Only enable tracing when scons build=debug
> ---
>   src/gallium/targets/haiku-softpipe/GalliumContext.cpp     | 3 +--
>   src/gallium/targets/haiku-softpipe/GalliumFramebuffer.cpp | 3 +--
>   src/gallium/targets/haiku-softpipe/SConscript             | 5 +++--
>   src/gallium/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
>