Mesa (master): libgl-xlib: enable galahad support

[Brian Paul]

Module: Mesa
Branch: master
Commit: f1de38b851d274b16e8b58669a110b0124e0f40b
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f1de38b851d274b16e8b58669a110b0124e0f40b

Author: Brian Paul <brianp at vmware.com>
Date:   Fri Sep  3 16:33:17 2010 -0600

libgl-xlib: enable galahad support

If the GALLIUM_GALAHAD env var is 1 we'll wrap the regular driver with
the galahad validation driver.

---

 src/gallium/targets/libgl-xlib/Makefile   |    3 ++-
 src/gallium/targets/libgl-xlib/SConscript |    4 ++++
 src/gallium/targets/libgl-xlib/xlib.c     |   12 ++++++++++++
 3 files changed, 18 insertions(+), 1 deletions(-)

diff --git a/src/gallium/targets/libgl-xlib/Makefile b/src/gallium/targets/libgl-xlib/Makefile
index fe05415..88cc0cc 100644
--- a/src/gallium/targets/libgl-xlib/Makefile
+++ b/src/gallium/targets/libgl-xlib/Makefile
@@ -25,7 +25,8 @@ INCLUDE_DIRS = \
 	$(X11_CFLAGS)
 
 DEFINES += \
-	-DGALLIUM_SOFTPIPE
+	-DGALLIUM_SOFTPIPE \
+	-DGALLIUM_GALAHAD
 #-DGALLIUM_CELL will be defined by the config */
 
 XLIB_TARGET_SOURCES = \
diff --git a/src/gallium/targets/libgl-xlib/SConscript b/src/gallium/targets/libgl-xlib/SConscript
index 88e216a..27b562e 100644
--- a/src/gallium/targets/libgl-xlib/SConscript
+++ b/src/gallium/targets/libgl-xlib/SConscript
@@ -48,6 +48,10 @@ 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.Tool('udis86')
diff --git a/src/gallium/targets/libgl-xlib/xlib.c b/src/gallium/targets/libgl-xlib/xlib.c
index 5a9c80c..5914f63 100644
--- a/src/gallium/targets/libgl-xlib/xlib.c
+++ b/src/gallium/targets/libgl-xlib/xlib.c
@@ -78,6 +78,10 @@ st_api_create_OpenGL()
 #include "cell/ppu/cell_public.h"
 #endif
 
+#ifdef GALLIUM_GALAHAD
+#include "galahad/glhd_public.h"
+#endif
+
 static struct pipe_screen *
 swrast_create_screen(struct sw_winsys *winsys)
 {
@@ -112,6 +116,14 @@ swrast_create_screen(struct sw_winsys *winsys)
       screen = softpipe_create_screen( winsys );
 #endif
 
+#if defined(GALLIUM_GALAHAD)
+   if (screen) {
+      struct pipe_screen *galahad_screen = galahad_screen_create(screen);
+      if (galahad_screen)
+         screen = galahad_screen;
+   }
+#endif
+
    return screen;
 }