[Mesa-dev] [PATCH 7/7] galahad: remove driver

Emil Velikov emil.l.velikov at gmail.com
Sat Mar 14 15:36:31 PDT 2015 

Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
---
The src/gallium/drivers/galahad changes are omitted from this patch.

-Emil

 configure.ac                                       |    1 -
 src/gallium/Makefile.am                            |    1 -
 src/gallium/SConscript                             |    1 -
 .../auxiliary/target-helpers/inline_debug_helper.h |    8 -
 src/gallium/docs/source/debugging.rst              |    4 -
 src/gallium/docs/source/distro.rst                 |    9 -
 src/gallium/drivers/galahad/Makefile.am            |   16 -
 src/gallium/drivers/galahad/Makefile.sources       |    8 -
 src/gallium/drivers/galahad/SConscript             |   12 -
 src/gallium/drivers/galahad/glhd_context.c         | 1056 --------------------
 src/gallium/drivers/galahad/glhd_context.h         |   69 --
 src/gallium/drivers/galahad/glhd_objects.c         |  186 ----
 src/gallium/drivers/galahad/glhd_objects.h         |  179 ----
 src/gallium/drivers/galahad/glhd_public.h          |   37 -
 src/gallium/drivers/galahad/glhd_screen.c          |  387 -------
 src/gallium/drivers/galahad/glhd_screen.h          |   48 -
 src/gallium/targets/dri/Makefile.am                |    2 -
 src/gallium/targets/dri/SConscript                 |    4 +-
 src/gallium/targets/graw-gdi/SConscript            |    4 +-
 src/gallium/targets/graw-xlib/SConscript           |    6 +-
 src/gallium/targets/libgl-xlib/Makefile.am         |    5 +-
 src/gallium/targets/libgl-xlib/SConscript          |    4 +-
 src/gallium/targets/pipe-loader/Makefile.am        |    4 +-
 23 files changed, 12 insertions(+), 2039 deletions(-)
 delete mode 100644 src/gallium/drivers/galahad/Makefile.am
 delete mode 100644 src/gallium/drivers/galahad/Makefile.sources
 delete mode 100644 src/gallium/drivers/galahad/SConscript
 delete mode 100644 src/gallium/drivers/galahad/glhd_context.c
 delete mode 100644 src/gallium/drivers/galahad/glhd_context.h
 delete mode 100644 src/gallium/drivers/galahad/glhd_objects.c
 delete mode 100644 src/gallium/drivers/galahad/glhd_objects.h
 delete mode 100644 src/gallium/drivers/galahad/glhd_public.h
 delete mode 100644 src/gallium/drivers/galahad/glhd_screen.c
 delete mode 100644 src/gallium/drivers/galahad/glhd_screen.h

diff --git a/configure.ac b/configure.ac
index e04d02e..67ec9f6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2356,7 +2356,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 9285037..ede6e21 100644
--- 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 9b9011f..680ad92 100644
--- 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 faae180..0648e59 100644
--- 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 8566dbd..8e96a6e 100644
--- 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 0785c0c..15468b6 100644
--- 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 aaeb950..f9e4ada 100644
--- 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 a732247..a51ed56 100644
--- 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 f8db6e6..67d4373 100644
--- 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 886811b..bf9cf72 100644
--- 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 de56e28..33b0d13 100644
--- 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 at GL_LIB@.la
@@ -62,7 +62,6 @@ lib at 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 6975188..df5a220 100644
--- 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 fe40f5b..967cdb7 100644
--- 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 = \
-- 
2.3.1

More information about the mesa-dev mailing list