targets/libgl-xlib: add code to inject trace and identity layers

Finally we can inject layers for debug, trace and "other" with
relative ease between state-tracker and driver.

1 files changed, 15 insertions, 1 deletions

diff --git a/src/gallium/targets/libgl-xlib/xlib.c b/src/gallium/targets/libgl-xlib/xlib.c
index 6651bd538ee..7881bc2cb18 100644
--- a/src/gallium/targets/libgl-xlib/xlib.c
+++ b/src/gallium/targets/libgl-xlib/xlib.c
@@ -36,8 +36,11 @@
 #include "util/u_debug.h"
 #include "softpipe/sp_public.h"
 #include "llvmpipe/lp_public.h"
+#include "identity/id_public.h"
+#include "trace/tr_public.h"
 #include "cell/ppu/cell_public.h"
 
+
 /* advertise OpenGL support */
 PUBLIC const int st_api_OpenGL = 1;
 
@@ -46,7 +49,7 @@ static struct pipe_screen *
 create_screen( struct sw_winsys *winsys )
 {
 #if defined(GALLIUM_CELL)
-   if (!getenv("GALLIUM_NOCELL")) 
+   if (!debug_get_bool_option("GALLIUM_NOCELL", FALSE)) 
       return cell_create_screen( winsys );
 #endif
 
@@ -73,6 +76,17 @@ xlib_create_screen( Display *display )
    if (screen == NULL)
       goto fail;
 
+   /* Finally we have somewhere to inject layers into the stack in a
+    * clean fashion:
+    */
+   if (debug_get_bool_option("GALLIUM_WRAP", FALSE)) {
+      screen = identity_screen_create(screen);
+   }
+
+   if (debug_get_bool_option("GALLIUM_TRACE", FALSE)) {
+      screen = trace_screen_create( screen );
+   }
+
    return screen;
 
 fail: