diff options
| author | Jakob Bornecrantz <jakob@vmware.com> | 2010-11-10 23:42:17 +0000 |
|---|---|---|
| committer | Jakob Bornecrantz <jakob@vmware.com> | 2010-11-17 23:49:08 +0000 |
| commit | c30656d8c24eafeb29276fa31503b30608239468 (patch) | |
| tree | 39160def95d179ab6b3ab45b8dd12cd3491426c9 /src/gallium/targets/libgl-xlib/xlib.c | |
| parent | 7819435f2ef484696560547fbc1325cb97c7174b (diff) | |
libgl-xlib: Use inline debug helper instead of non-inline version
Diffstat (limited to 'src/gallium/targets/libgl-xlib/xlib.c')
| -rw-r--r-- | src/gallium/targets/libgl-xlib/xlib.c | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/src/gallium/targets/libgl-xlib/xlib.c b/src/gallium/targets/libgl-xlib/xlib.c index b0d1e52910..9a3e0e07b0 100644 --- a/src/gallium/targets/libgl-xlib/xlib.c +++ b/src/gallium/targets/libgl-xlib/xlib.c @@ -32,17 +32,15 @@ */ #include "pipe/p_compiler.h" #include "util/u_debug.h" -#include "target-helpers/wrap_screen.h" -#include "target-helpers/inline_sw_helper.h" #include "state_tracker/xlib_sw_winsys.h" #include "xm_public.h" #include "state_tracker/st_api.h" #include "state_tracker/st_gl_api.h" +#include "target-helpers/inline_sw_helper.h" +#include "target-helpers/inline_debug_helper.h" + -#if defined(GALLIUM_GALAHAD) -#include "galahad/glhd_public.h" -#endif /* Helper function to build a subset of a driver stack consisting of * one of the software rasterizers (cell, llvmpipe, softpipe) and the @@ -67,18 +65,9 @@ swrast_xlib_create_screen( Display *display ) if (screen == NULL) goto fail; - /* XXX will fix soon */ -#if defined(GALLIUM_GALAHAD) - if (screen) { - struct pipe_screen *galahad_screen = galahad_screen_create( screen ); - if (galahad_screen) - screen = galahad_screen; - } -#endif - /* Inject any wrapping layers we want to here: */ - return gallium_wrap_screen( screen ); + return debug_screen_wrap( screen ); fail: if (winsys) |