From 429a4355259b3c4fe80838b499a8d8afa41f290a Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Sat, 14 Mar 2015 22:36:31 +0000 Subject: [PATCH] galahad: remove driver Signed-off-by: Emil Velikov Acked-by: Matt Turner --- 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/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 +--- 13 files changed, 12 insertions(+), 41 deletions(-) diff --git a/configure.ac b/configure.ac index 94e0d879615..a8eb0c9d602 100644 --- 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 9285037e17b..ede6e21233a 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 9b9011f7f01..680ad925f5f 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 faae1800e72..0648e596549 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 8566dbdd751..8e96a6e4874 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 (false) - -Controls if the :ref:`galahad` sanity checker module should be used. - .. envvar:: GALLIUM_RBUG (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 0785c0c3fb2..15468b6eebd 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 aaeb950707b..f9e4ada9338 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 a7322476452..a51ed564344 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 f8db6e6c85d..67d437374fb 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 886811b4b3b..bf9cf72c6e1 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 de56e28d16a..33b0d1345de 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@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 69751887985..df5a220ac25 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 fe40f5b181e..967cdb76542 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.30.2