diff options
| author | Jakob Bornecrantz <jakob@vmware.com> | 2010-11-10 22:02:39 +0000 |
|---|---|---|
| committer | Jakob Bornecrantz <jakob@vmware.com> | 2010-11-17 23:49:09 +0000 |
| commit | b46340c740eb5388e9917fca365a6c3003385dff (patch) | |
| tree | ce98edb1483eb030648d998dba535407085f9811 /src/gallium/targets/graw-xlib | |
| parent | c30656d8c24eafeb29276fa31503b30608239468 (diff) | |
graw: Use inline debug helper instead of non-inline version
Diffstat (limited to 'src/gallium/targets/graw-xlib')
| -rw-r--r-- | src/gallium/targets/graw-xlib/SConscript | 4 | ||||
| -rw-r--r-- | src/gallium/targets/graw-xlib/graw_xlib.c | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/gallium/targets/graw-xlib/SConscript b/src/gallium/targets/graw-xlib/SConscript index e50eb8a03d..6d32ea537d 100644 --- a/src/gallium/targets/graw-xlib/SConscript +++ b/src/gallium/targets/graw-xlib/SConscript @@ -9,7 +9,7 @@ env.Prepend(LIBS = [ ws_xlib, trace, rbug, - identity, + galahad, gallium, ]) @@ -20,6 +20,8 @@ env.Append(CPPPATH = [ '#src/gallium/include/state_tracker', ]) +env.Append(CPPDEFINES = ['GALLIUM_RBUG', 'GALLIUM_TRACE', 'GALLIUM_GALAHAD']) + sources = [ 'graw_xlib.c', graw_util diff --git a/src/gallium/targets/graw-xlib/graw_xlib.c b/src/gallium/targets/graw-xlib/graw_xlib.c index 8658e19e3a..578086f8f9 100644 --- a/src/gallium/targets/graw-xlib/graw_xlib.c +++ b/src/gallium/targets/graw-xlib/graw_xlib.c @@ -3,8 +3,8 @@ #include "pipe/p_screen.h" #include "util/u_debug.h" #include "util/u_memory.h" -#include "target-helpers/wrap_screen.h" #include "target-helpers/inline_sw_helper.h" +#include "target-helpers/inline_debug_helper.h" #include "state_tracker/xlib_sw_winsys.h" #include "state_tracker/graw.h" @@ -36,7 +36,7 @@ graw_create_screen( void ) /* Inject any wrapping layers we want to here: */ - return gallium_wrap_screen( screen ); + return debug_screen_wrap( screen ); } |