diff options
author | Ben Skeggs <skeggsb@gmail.com> | 2008-08-11 16:07:56 +1000 |
---|---|---|
committer | Ben Skeggs <skeggsb@gmail.com> | 2008-08-11 16:07:56 +1000 |
commit | f56eda6a85912dee9eef9099f6023c6bab05a41a (patch) | |
tree | 068107b1bcf1aec4847c059e18a3e5f3a0b3c303 /src/gallium/winsys/xlib/xm_winsys.c | |
parent | ce8e846ffea8e1a11b8ae4ba05a7386e7c34cc9f (diff) | |
parent | 5549d35db5323829702099af6e53a8dd7c451524 (diff) |
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
Diffstat (limited to 'src/gallium/winsys/xlib/xm_winsys.c')
-rw-r--r-- | src/gallium/winsys/xlib/xm_winsys.c | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/src/gallium/winsys/xlib/xm_winsys.c b/src/gallium/winsys/xlib/xm_winsys.c index 9225ee510d..6071a5ad5e 100644 --- a/src/gallium/winsys/xlib/xm_winsys.c +++ b/src/gallium/winsys/xlib/xm_winsys.c @@ -54,6 +54,12 @@ #define TILE_SIZE 32 /* avoid compilation errors */ #endif +#ifdef GALLIUM_TRACE +#include "trace/tr_winsys.h" +#include "trace/tr_screen.h" +#include "trace/tr_context.h" +#endif + #include "xm_winsys_aub.h" @@ -645,7 +651,11 @@ xmesa_get_pipe_winsys(struct xmesa_visual *xm_vis) ws->base.get_name = xm_get_name; } - return &ws->base; +#ifdef GALLIUM_TRACE + return trace_winsys_create(&ws->base); +#else + return &ws->base; +#endif } @@ -674,7 +684,15 @@ xmesa_create_pipe_context(XMesaContext xmesa, uint pixelformat) { struct pipe_screen *screen = softpipe_create_screen(pws); +#ifdef GALLIUM_TRACE + screen = trace_screen_create(screen); +#endif + pipe = softpipe_create(screen, pws, NULL); + +#ifdef GALLIUM_TRACE + pipe = trace_context_create(pipe); +#endif } if (pipe) |