galahad: remove driver

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Acked-by: Matt Turner <mattst88@gmail.com>

diff --git a/configure.ac b/configure.ac
index 94e0d8796156ed6332002b7bf9692226c6e2f778..a8eb0c9d6023c731792d3885d5205020420e346f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2368,7 +2368,6 @@ AC_CONFIG_FILES([Makefile
                src/gallium/auxiliary/Makefile
                src/gallium/auxiliary/pipe-loader/Makefile
                src/gallium/drivers/freedreno/Makefile
-               src/gallium/drivers/galahad/Makefile
                src/gallium/drivers/i915/Makefile
                src/gallium/drivers/ilo/Makefile
                src/gallium/drivers/llvmpipe/Makefile

diff --git a/src/gallium/Makefile.am b/src/gallium/Makefile.am
index 9285037e17b5610289ddffede08adbb041fe0325..ede6e21233a8612bbd8a5be841b7c1b2a61695ea 100644 (file)
--- a/src/gallium/Makefile.am
+++ b/src/gallium/Makefile.am
@@ -11,7 +11,6 @@ SUBDIRS += auxiliary
 ##
 
 SUBDIRS += \
-       drivers/galahad \
        drivers/noop \
        drivers/trace \
        drivers/rbug

diff --git a/src/gallium/SConscript b/src/gallium/SConscript
index 9b9011f7f01c69ad0b3f41af613116ebf951707e..680ad925f5fa82e86d1fc30cc16351c373ac16f5 100644 (file)
--- a/src/gallium/SConscript
+++ b/src/gallium/SConscript
@@ -12,7 +12,6 @@ SConscript('auxiliary/SConscript')
 
 # These are common and work across all platforms
 SConscript([
-    'drivers/galahad/SConscript',
     'drivers/llvmpipe/SConscript',
     'drivers/rbug/SConscript',
     'drivers/softpipe/SConscript',

diff --git a/src/gallium/auxiliary/target-helpers/inline_debug_helper.h b/src/gallium/auxiliary/target-helpers/inline_debug_helper.h
index faae1800e7211babfcc12721903190293e42354f..0648e59654916b808ae3afd90fe8de1e03e0ef27 100644 (file)
--- a/src/gallium/auxiliary/target-helpers/inline_debug_helper.h
+++ b/src/gallium/auxiliary/target-helpers/inline_debug_helper.h
@@ -19,10 +19,6 @@
 #include "rbug/rbug_public.h"
 #endif
 
-#ifdef GALLIUM_GALAHAD
-#include "galahad/glhd_public.h"
-#endif
-
 #ifdef GALLIUM_NOOP
 #include "noop/noop_public.h"
 #endif
@@ -42,10 +38,6 @@ debug_screen_wrap(struct pipe_screen *screen)
    screen = trace_screen_create(screen);
 #endif
 
-#if defined(GALLIUM_GALAHAD)
-   screen = galahad_screen_create(screen);
-#endif
-
 #if defined(GALLIUM_NOOP)
    screen = noop_screen_create(screen);
 #endif

diff --git a/src/gallium/docs/source/debugging.rst b/src/gallium/docs/source/debugging.rst
index 8566dbdd75157d2f0f32a649153c58c89000d346..8e96a6e48742f75871847c35d9f2645e64dedf49 100644 (file)
--- a/src/gallium/docs/source/debugging.rst
+++ b/src/gallium/docs/source/debugging.rst
@@ -21,10 +21,6 @@ This option controls if the debug variables should be printed to stderr. This
 is probably the most useful variable, since it allows you to find which
 variables a driver uses.
 
-.. envvar:: GALLIUM_GALAHAD <bool> (false)
-
-Controls if the :ref:`galahad` sanity checker module should be used.
-
 .. envvar:: GALLIUM_RBUG <bool> (false)
 
 Controls if the :ref:`rbug` should be used.

diff --git a/src/gallium/docs/source/distro.rst b/src/gallium/docs/source/distro.rst
index 0785c0c3fb260436e6ca554c8419a9124a8d0d70..15468b6eebda122cd757f68e8e4494d7219ce99e 100644 (file)
--- a/src/gallium/docs/source/distro.rst
+++ b/src/gallium/docs/source/distro.rst
@@ -78,15 +78,6 @@ Rbug
 
 Wrapper driver. :ref:`rbug` driver used with stand alone rbug-gui.
 
-.. _galahad:
-
-Galahad
-^^^^^^^
-
-Wrapper driver. Sanity checker for the internal gallium state. Normally
-a driver should n't have to sanity check the input it gets from a state
-tracker. Any wrong state received should be perceived as a state tracker bug.
-
 State Trackers
 --------------
 

diff --git a/src/gallium/targets/dri/Makefile.am b/src/gallium/targets/dri/Makefile.am
index aaeb950707b1010c6b5ceedbe56139383374fa86..f9e4ada9338a01c22d83b4d9b79d48a57eb70965 100644 (file)
--- a/src/gallium/targets/dri/Makefile.am
+++ b/src/gallium/targets/dri/Makefile.am
@@ -11,7 +11,6 @@ AM_CFLAGS = \
 AM_CPPFLAGS = \
        $(DEFINES) \
        -DDRI_TARGET \
-       -DGALLIUM_GALAHAD \
        -DGALLIUM_NOOP \
        -DGALLIUM_RBUG \
        -DGALLIUM_TRACE
@@ -46,7 +45,6 @@ gallium_dri_la_LIBADD = \
        $(top_builddir)/src/gallium/state_trackers/dri/libdri.la \
        $(top_builddir)/src/gallium/auxiliary/libgalliumvl.la \
        $(top_builddir)/src/gallium/auxiliary/libgallium.la \
-       $(top_builddir)/src/gallium/drivers/galahad/libgalahad.la \
        $(top_builddir)/src/gallium/drivers/noop/libnoop.la \
        $(top_builddir)/src/gallium/drivers/rbug/librbug.la \
        $(top_builddir)/src/gallium/drivers/trace/libtrace.la \

diff --git a/src/gallium/targets/dri/SConscript b/src/gallium/targets/dri/SConscript
index a7322476452f0ef356fdd5dbf7631ae297d577a7..a51ed564344486b91a95d51e725b622d256bf020 100644 (file)
--- a/src/gallium/targets/dri/SConscript
+++ b/src/gallium/targets/dri/SConscript
@@ -18,8 +18,8 @@ if env['build'] == 'release':
     env.Append(CPPDEFINES = ['GALLIUM_RBUG'])
     env.Prepend(LIBS = [rbug])
 else:
-    env.Append(CPPDEFINES = ['GALLIUM_TRACE', 'GALLIUM_RBUG', 'GALLIUM_GALAHAD'])
-    env.Prepend(LIBS = [trace, rbug, galahad])
+    env.Append(CPPDEFINES = ['GALLIUM_TRACE', 'GALLIUM_RBUG'])
+    env.Prepend(LIBS = [trace, rbug])
 
 if env['llvm']:
     env.Append(CPPDEFINES = 'GALLIUM_LLVMPIPE')

diff --git a/src/gallium/targets/graw-gdi/SConscript b/src/gallium/targets/graw-gdi/SConscript
index f8db6e6c85d732d40658ae692d143d55b7e66406..67d437374fb8c17deeeee77caca8b00add914a30 100644 (file)
--- a/src/gallium/targets/graw-gdi/SConscript
+++ b/src/gallium/targets/graw-gdi/SConscript
@@ -23,8 +23,8 @@ sources = [
 ]
 
 if True:
-    env.Append(CPPDEFINES = ['GALLIUM_TRACE', 'GALLIUM_RBUG', 'GALLIUM_GALAHAD', 'GALLIUM_SOFTPIPE'])
-    env.Prepend(LIBS = [trace, rbug, galahad, softpipe])
+    env.Append(CPPDEFINES = ['GALLIUM_TRACE', 'GALLIUM_RBUG', 'GALLIUM_SOFTPIPE'])
+    env.Prepend(LIBS = [trace, rbug, softpipe])
 
 if env['llvm']:
     env.Append(CPPDEFINES = 'GALLIUM_LLVMPIPE')

diff --git a/src/gallium/targets/graw-xlib/SConscript b/src/gallium/targets/graw-xlib/SConscript
index 886811b4b3b3e9c1f57262b2223473862ee0c6e3..bf9cf72c6e18100f49c5408e19aa270dd1a9e576 100644 (file)
--- a/src/gallium/targets/graw-xlib/SConscript
+++ b/src/gallium/targets/graw-xlib/SConscript
@@ -20,7 +20,7 @@ env.Append(CPPPATH = [
     '#src/gallium/winsys',
 ])
 
-env.Append(CPPDEFINES = ['GALLIUM_RBUG', 'GALLIUM_TRACE', 'GALLIUM_GALAHAD'])
+env.Append(CPPDEFINES = ['GALLIUM_RBUG', 'GALLIUM_TRACE'])
 
 sources = [
     'graw_xlib.c',
@@ -28,8 +28,8 @@ sources = [
 ]
 
 if True:
-    env.Append(CPPDEFINES = ['GALLIUM_TRACE', 'GALLIUM_RBUG', 'GALLIUM_GALAHAD', 'GALLIUM_SOFTPIPE'])
-    env.Prepend(LIBS = [trace, rbug, galahad, softpipe])
+    env.Append(CPPDEFINES = ['GALLIUM_TRACE', 'GALLIUM_RBUG', 'GALLIUM_SOFTPIPE'])
+    env.Prepend(LIBS = [trace, rbug, softpipe])
 
 if env['llvm']:
     env.Append(CPPDEFINES = 'GALLIUM_LLVMPIPE')

diff --git a/src/gallium/targets/libgl-xlib/Makefile.am b/src/gallium/targets/libgl-xlib/Makefile.am
index de56e28d16ad3533d4d7b9690cbce4712131945e..33b0d1345def7a8c38021237302fe522a99594ac 100644 (file)
--- a/src/gallium/targets/libgl-xlib/Makefile.am
+++ b/src/gallium/targets/libgl-xlib/Makefile.am
@@ -37,8 +37,8 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/gallium/winsys \
        -DGALLIUM_SOFTPIPE \
        -DGALLIUM_RBUG \
-       -DGALLIUM_TRACE \
-       -DGALLIUM_GALAHAD
+       -DGALLIUM_TRACE
+
 AM_CFLAGS = $(X11_INCLUDES)
 
 lib_LTLIBRARIES = lib@GL_LIB@.la
@@ -62,7 +62,6 @@ lib@GL_LIB@_la_LIBADD = \
        $(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la \
        $(top_builddir)/src/gallium/drivers/trace/libtrace.la \
        $(top_builddir)/src/gallium/drivers/rbug/librbug.la \
-       $(top_builddir)/src/gallium/drivers/galahad/libgalahad.la \
        $(top_builddir)/src/mapi/glapi/libglapi.la \
        $(top_builddir)/src/mesa/libmesagallium.la \
        $(top_builddir)/src/gallium/auxiliary/libgallium.la \

diff --git a/src/gallium/targets/libgl-xlib/SConscript b/src/gallium/targets/libgl-xlib/SConscript
index 69751887985dfced09155b12f4fb9ad2c281d4fd..df5a220ac2594d74d3edb0f35880cefff3b295a9 100644 (file)
--- a/src/gallium/targets/libgl-xlib/SConscript
+++ b/src/gallium/targets/libgl-xlib/SConscript
@@ -39,8 +39,8 @@ sources = [
 ]
 
 if True:
-    env.Append(CPPDEFINES = ['GALLIUM_TRACE', 'GALLIUM_RBUG', 'GALLIUM_GALAHAD', 'GALLIUM_SOFTPIPE'])
-    env.Prepend(LIBS = [trace, rbug, galahad, softpipe])
+    env.Append(CPPDEFINES = ['GALLIUM_TRACE', 'GALLIUM_RBUG', 'GALLIUM_SOFTPIPE'])
+    env.Prepend(LIBS = [trace, rbug, softpipe])
 
 if env['llvm']:
     env.Append(CPPDEFINES = ['GALLIUM_LLVMPIPE'])

diff --git a/src/gallium/targets/pipe-loader/Makefile.am b/src/gallium/targets/pipe-loader/Makefile.am
index fe40f5b181e488ca2fcdfcfdb387f1689e74e13b..967cdb7654204202a1b8635587c775924c554638 100644 (file)
--- a/src/gallium/targets/pipe-loader/Makefile.am
+++ b/src/gallium/targets/pipe-loader/Makefile.am
@@ -30,8 +30,7 @@ AM_CPPFLAGS = \
        $(LIBDRM_CFLAGS) \
        $(VISIBILITY_CFLAGS) \
        -DGALLIUM_RBUG \
-       -DGALLIUM_TRACE \
-       -DGALLIUM_GALAHAD
+       -DGALLIUM_TRACE
 
 pipedir = $(libdir)/gallium-pipe
 pipe_LTLIBRARIES =
@@ -56,7 +55,6 @@ PIPE_LIBS += \
        $(top_builddir)/src/util/libmesautil.la \
        $(top_builddir)/src/gallium/drivers/rbug/librbug.la \
        $(top_builddir)/src/gallium/drivers/trace/libtrace.la \
-       $(top_builddir)/src/gallium/drivers/galahad/libgalahad.la \
        $(GALLIUM_COMMON_LIB_DEPS)
 
 AM_LDFLAGS = \