libgl-xlib: Use inline debug helper instead of non-inline version

diff --git a/src/gallium/targets/libgl-xlib/Makefile b/src/gallium/targets/libgl-xlib/Makefile
index 076a040a5abe6a9e56b4fa46a877b106cc9edae9..fb537c3155684d31a3abf35387043ece86b255f9 100644 (file)
--- a/src/gallium/targets/libgl-xlib/Makefile
+++ b/src/gallium/targets/libgl-xlib/Makefile
@@ -26,6 +26,8 @@ INCLUDE_DIRS = \
 
 DEFINES += \
        -DGALLIUM_SOFTPIPE \
+       -DGALLIUM_RBUG \
+       -DGALLIUM_TRACE \
        -DGALLIUM_GALAHAD
 #-DGALLIUM_CELL will be defined by the config */
 
@@ -44,7 +46,7 @@ LIBS = \
        $(TOP)/src/gallium/winsys/sw/xlib/libws_xlib.a \
        $(TOP)/src/gallium/drivers/trace/libtrace.a \
        $(TOP)/src/gallium/drivers/rbug/librbug.a \
-       $(TOP)/src/gallium/drivers/identity/libidentity.a \
+       $(TOP)/src/gallium/drivers/galahad/libgalahad.a \
        $(TOP)/src/mapi/glapi/libglapi.a \
        $(TOP)/src/mesa/libmesagallium.a \
        $(GALLIUM_AUXILIARIES) \

diff --git a/src/gallium/targets/libgl-xlib/SConscript b/src/gallium/targets/libgl-xlib/SConscript
index 582760eac93c3d28b218ec736531888d3387a7e7..6582a2f27bd77079e3fc5ec9800f457bc4429fed 100644 (file)
--- a/src/gallium/targets/libgl-xlib/SConscript
+++ b/src/gallium/targets/libgl-xlib/SConscript
@@ -21,7 +21,7 @@ env.Prepend(LIBS = [
     ws_xlib,
     trace,
     rbug,
-    identity,
+    galahad,
     glapi,
     mesa,
     glsl,
@@ -37,10 +37,6 @@ if True:
     env.Append(CPPDEFINES = 'GALLIUM_SOFTPIPE')
     env.Prepend(LIBS = [softpipe])
 
-if True:
-    env.Append(CPPDEFINES = 'GALLIUM_GALAHAD')
-    env.Prepend(LIBS = [galahad])
-
 if env['llvm']:
     env.Append(CPPDEFINES = 'GALLIUM_LLVMPIPE')
     env.Prepend(LIBS = [llvmpipe])

diff --git a/src/gallium/targets/libgl-xlib/xlib.c b/src/gallium/targets/libgl-xlib/xlib.c
index b0d1e529104498f0fc7de6eac166328658dc0ac7..9a3e0e07b0d2aa9661d90b0c9c19786f6cde3d46 100644 (file)
--- 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)