Mesa (master): graw: Use inline debug helper instead of non-inline version
Jakob Bornecrantz
wallbraker at kemper.freedesktop.org
Wed Nov 17 23:50:08 UTC 2010
Module: Mesa
Branch: master
Commit: b46340c740eb5388e9917fca365a6c3003385dff
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b46340c740eb5388e9917fca365a6c3003385dff
Author: Jakob Bornecrantz <jakob at vmware.com>
Date: Wed Nov 10 22:02:39 2010 +0000
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 ++--
src/gallium/targets/graw-xlib/SConscript | 4 +++-
src/gallium/targets/graw-xlib/graw_xlib.c | 4 ++--
4 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/gallium/targets/graw-gdi/SConscript b/src/gallium/targets/graw-gdi/SConscript
index 8ee8915..8d98b36 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 bd6242b..17ca2a7 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 e50eb8a..6d32ea5 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 8658e19..578086f 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 );
}
More information about the mesa-commit
mailing list