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@vmware.com>
This commit is contained in:
Alexander von Gluck IV 2013-10-06 15:41:54 +00:00
parent 69508950da
commit 0fda1cb498
4 changed files with 6 additions and 8 deletions

View file

@ -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

View file

@ -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

View file

@ -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,

View file

@ -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