diff options
| author | Christoph Bumiller <e0425955@student.tuwien.ac.at> | 2010-12-19 21:46:33 +0100 |
|---|---|---|
| committer | Christoph Bumiller <e0425955@student.tuwien.ac.at> | 2010-12-19 21:46:33 +0100 |
| commit | 0f68236a2487dbeb0396b996debcda595b0b54a1 (patch) | |
| tree | 938ae3b779349b6dba6f5a891550604f9a9ca895 /src/gallium/targets/graw-gdi | |
| parent | d047168d81cfeb39a98f3ae16416872facc6237c (diff) | |
| parent | 237880463d5168cad8df0bae6018b5fd76617777 (diff) | |
Merge remote branch 'origin/master' into nvc0-new
Diffstat (limited to 'src/gallium/targets/graw-gdi')
| -rw-r--r-- | src/gallium/targets/graw-gdi/SConscript | 12 | ||||
| -rw-r--r-- | src/gallium/targets/graw-gdi/graw_gdi.c | 4 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/gallium/targets/graw-gdi/SConscript b/src/gallium/targets/graw-gdi/SConscript index 8ee8915ace..352efe95d0 100644 --- a/src/gallium/targets/graw-gdi/SConscript +++ b/src/gallium/targets/graw-gdi/SConscript @@ -12,9 +12,6 @@ env.Append(CPPPATH = [ env.Prepend(LIBS = [ gallium, 'gdi32', - identity, - rbug, - trace, 'user32', 'ws2_32', ]) @@ -24,8 +21,13 @@ sources = [ graw_util, ] -env.Append(CPPDEFINES = 'GALLIUM_SOFTPIPE') -env.Prepend(LIBS = [softpipe]) +if True: + env.Append(CPPDEFINES = ['GALLIUM_TRACE', 'GALLIUM_RBUG', 'GALLIUM_GALAHAD', 'GALLIUM_SOFTPIPE']) + env.Prepend(LIBS = [trace, rbug, galahad, softpipe]) + +if env['llvm']: + env.Append(CPPDEFINES = 'GALLIUM_LLVMPIPE') + env.Prepend(LIBS = [llvmpipe]) graw = env.SharedLibrary( target = 'graw', 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) |