graw: Use inline debug helper instead of non-inline version

4 files changed, 10 insertions, 5 deletions

diff --git a/src/gallium/targets/graw-gdi/SConscript b/src/gallium/targets/graw-gdi/SConscript
index 8ee8915acec..8d98b36fba4 100644
--- a/src/gallium/targets/graw-gdi/SConscript
+++ b/src/gallium/targets/graw-gdi/SConscript
@@ -9,12 +9,15 @@ env.Append(CPPPATH = [
     '#src/gallium/winsys/sw',
 ])
 
+env.Append(CPPDEFINES = ['GALLIUM_RBUG', 'GALLIUM_TRACE', 'GALLIUM_GALAHAD'])
+
 env.Prepend(LIBS = [
     gallium,
     'gdi32',
     identity,
     rbug,
     trace,
+    galahad,
     'user32',
     'ws2_32',
 ])
diff --git a/src/gallium/targets/graw-gdi/graw_gdi.c b/src/gallium/targets/graw-gdi/graw_gdi.c
index bd6242b0779..17ca2a761ca 100644
--- a/src/gallium/targets/graw-gdi/graw_gdi.c
+++ b/src/gallium/targets/graw-gdi/graw_gdi.c
@@ -29,7 +29,7 @@
 #include "gdi/gdi_sw_winsys.h"
 #include "pipe/p_screen.h"
 #include "state_tracker/graw.h"
-#include "target-helpers/wrap_screen.h"
+#include "target-helpers/inline_debug_helper.h"
 #include "target-helpers/inline_sw_helper.h"
 #include <windows.h>
 
@@ -116,7 +116,7 @@ graw_create_window_and_screen(int x,
 
    *handle = (void *)hDC;
 
-   return gallium_wrap_screen(screen);
+   return debug_screen_wrap(screen);
 
 fail:
    if (hWnd)
diff --git a/src/gallium/targets/graw-xlib/SConscript b/src/gallium/targets/graw-xlib/SConscript
index e50eb8a03d7..6d32ea537d2 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 8658e19e3a3..578086f8f9a 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 );
 }