summaryrefslogtreecommitdiffstats
path: root/src/gallium
diff options
context:
space:
mode:
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/Makefile.am1
-rw-r--r--src/gallium/SConscript1
-rw-r--r--src/gallium/auxiliary/target-helpers/inline_debug_helper.h8
-rw-r--r--src/gallium/docs/source/debugging.rst4
-rw-r--r--src/gallium/docs/source/distro.rst9
-rw-r--r--src/gallium/targets/dri/Makefile.am2
-rw-r--r--src/gallium/targets/dri/SConscript4
-rw-r--r--src/gallium/targets/graw-gdi/SConscript4
-rw-r--r--src/gallium/targets/graw-xlib/SConscript6
-rw-r--r--src/gallium/targets/libgl-xlib/Makefile.am5
-rw-r--r--src/gallium/targets/libgl-xlib/SConscript4
-rw-r--r--src/gallium/targets/pipe-loader/Makefile.am4
12 files changed, 12 insertions, 40 deletions
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 <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 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@[email protected]
@@ -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 = \
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-02 15:48:05 +0000