From b46340c740eb5388e9917fca365a6c3003385dff Mon Sep 17 00:00:00 2001
From: Jakob Bornecrantz <jakob@vmware.com>
Date: Wed, 10 Nov 2010 22:02:39 +0000
Subject: graw: Use inline debug helper instead of non-inline version

---
 src/gallium/targets/graw-gdi/SConscript | 3 +++
 src/gallium/targets/graw-gdi/graw_gdi.c | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/gallium/targets/graw-gdi')

diff --git a/src/gallium/targets/graw-gdi/SConscript b/src/gallium/targets/graw-gdi/SConscript
index 8ee8915ace..8d98b36fba 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 bd6242b077..17ca2a761c 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)
-- 
cgit v1.2.3