galahad: remove driver
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Acked-by: Matt Turner <mattst88@gmail.com>
This commit is contained in:
@@ -2368,7 +2368,6 @@ AC_CONFIG_FILES([Makefile
|
|||||||
src/gallium/auxiliary/Makefile
|
src/gallium/auxiliary/Makefile
|
||||||
src/gallium/auxiliary/pipe-loader/Makefile
|
src/gallium/auxiliary/pipe-loader/Makefile
|
||||||
src/gallium/drivers/freedreno/Makefile
|
src/gallium/drivers/freedreno/Makefile
|
||||||
src/gallium/drivers/galahad/Makefile
|
|
||||||
src/gallium/drivers/i915/Makefile
|
src/gallium/drivers/i915/Makefile
|
||||||
src/gallium/drivers/ilo/Makefile
|
src/gallium/drivers/ilo/Makefile
|
||||||
src/gallium/drivers/llvmpipe/Makefile
|
src/gallium/drivers/llvmpipe/Makefile
|
||||||
|
@@ -11,7 +11,6 @@ SUBDIRS += auxiliary
|
|||||||
##
|
##
|
||||||
|
|
||||||
SUBDIRS += \
|
SUBDIRS += \
|
||||||
drivers/galahad \
|
|
||||||
drivers/noop \
|
drivers/noop \
|
||||||
drivers/trace \
|
drivers/trace \
|
||||||
drivers/rbug
|
drivers/rbug
|
||||||
|
@@ -12,7 +12,6 @@ SConscript('auxiliary/SConscript')
|
|||||||
|
|
||||||
# These are common and work across all platforms
|
# These are common and work across all platforms
|
||||||
SConscript([
|
SConscript([
|
||||||
'drivers/galahad/SConscript',
|
|
||||||
'drivers/llvmpipe/SConscript',
|
'drivers/llvmpipe/SConscript',
|
||||||
'drivers/rbug/SConscript',
|
'drivers/rbug/SConscript',
|
||||||
'drivers/softpipe/SConscript',
|
'drivers/softpipe/SConscript',
|
||||||
|
@@ -19,10 +19,6 @@
|
|||||||
#include "rbug/rbug_public.h"
|
#include "rbug/rbug_public.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef GALLIUM_GALAHAD
|
|
||||||
#include "galahad/glhd_public.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef GALLIUM_NOOP
|
#ifdef GALLIUM_NOOP
|
||||||
#include "noop/noop_public.h"
|
#include "noop/noop_public.h"
|
||||||
#endif
|
#endif
|
||||||
@@ -42,10 +38,6 @@ debug_screen_wrap(struct pipe_screen *screen)
|
|||||||
screen = trace_screen_create(screen);
|
screen = trace_screen_create(screen);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(GALLIUM_GALAHAD)
|
|
||||||
screen = galahad_screen_create(screen);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(GALLIUM_NOOP)
|
#if defined(GALLIUM_NOOP)
|
||||||
screen = noop_screen_create(screen);
|
screen = noop_screen_create(screen);
|
||||||
#endif
|
#endif
|
||||||
|
@@ -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
|
is probably the most useful variable, since it allows you to find which
|
||||||
variables a driver uses.
|
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)
|
.. envvar:: GALLIUM_RBUG <bool> (false)
|
||||||
|
|
||||||
Controls if the :ref:`rbug` should be used.
|
Controls if the :ref:`rbug` should be used.
|
||||||
|
@@ -78,15 +78,6 @@ Rbug
|
|||||||
|
|
||||||
Wrapper driver. :ref:`rbug` driver used with stand alone rbug-gui.
|
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
|
State Trackers
|
||||||
--------------
|
--------------
|
||||||
|
|
||||||
|
@@ -11,7 +11,6 @@ AM_CFLAGS = \
|
|||||||
AM_CPPFLAGS = \
|
AM_CPPFLAGS = \
|
||||||
$(DEFINES) \
|
$(DEFINES) \
|
||||||
-DDRI_TARGET \
|
-DDRI_TARGET \
|
||||||
-DGALLIUM_GALAHAD \
|
|
||||||
-DGALLIUM_NOOP \
|
-DGALLIUM_NOOP \
|
||||||
-DGALLIUM_RBUG \
|
-DGALLIUM_RBUG \
|
||||||
-DGALLIUM_TRACE
|
-DGALLIUM_TRACE
|
||||||
@@ -46,7 +45,6 @@ gallium_dri_la_LIBADD = \
|
|||||||
$(top_builddir)/src/gallium/state_trackers/dri/libdri.la \
|
$(top_builddir)/src/gallium/state_trackers/dri/libdri.la \
|
||||||
$(top_builddir)/src/gallium/auxiliary/libgalliumvl.la \
|
$(top_builddir)/src/gallium/auxiliary/libgalliumvl.la \
|
||||||
$(top_builddir)/src/gallium/auxiliary/libgallium.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/noop/libnoop.la \
|
||||||
$(top_builddir)/src/gallium/drivers/rbug/librbug.la \
|
$(top_builddir)/src/gallium/drivers/rbug/librbug.la \
|
||||||
$(top_builddir)/src/gallium/drivers/trace/libtrace.la \
|
$(top_builddir)/src/gallium/drivers/trace/libtrace.la \
|
||||||
|
@@ -18,8 +18,8 @@ if env['build'] == 'release':
|
|||||||
env.Append(CPPDEFINES = ['GALLIUM_RBUG'])
|
env.Append(CPPDEFINES = ['GALLIUM_RBUG'])
|
||||||
env.Prepend(LIBS = [rbug])
|
env.Prepend(LIBS = [rbug])
|
||||||
else:
|
else:
|
||||||
env.Append(CPPDEFINES = ['GALLIUM_TRACE', 'GALLIUM_RBUG', 'GALLIUM_GALAHAD'])
|
env.Append(CPPDEFINES = ['GALLIUM_TRACE', 'GALLIUM_RBUG'])
|
||||||
env.Prepend(LIBS = [trace, rbug, galahad])
|
env.Prepend(LIBS = [trace, rbug])
|
||||||
|
|
||||||
if env['llvm']:
|
if env['llvm']:
|
||||||
env.Append(CPPDEFINES = 'GALLIUM_LLVMPIPE')
|
env.Append(CPPDEFINES = 'GALLIUM_LLVMPIPE')
|
||||||
|
@@ -23,8 +23,8 @@ sources = [
|
|||||||
]
|
]
|
||||||
|
|
||||||
if True:
|
if True:
|
||||||
env.Append(CPPDEFINES = ['GALLIUM_TRACE', 'GALLIUM_RBUG', 'GALLIUM_GALAHAD', 'GALLIUM_SOFTPIPE'])
|
env.Append(CPPDEFINES = ['GALLIUM_TRACE', 'GALLIUM_RBUG', 'GALLIUM_SOFTPIPE'])
|
||||||
env.Prepend(LIBS = [trace, rbug, galahad, softpipe])
|
env.Prepend(LIBS = [trace, rbug, softpipe])
|
||||||
|
|
||||||
if env['llvm']:
|
if env['llvm']:
|
||||||
env.Append(CPPDEFINES = 'GALLIUM_LLVMPIPE')
|
env.Append(CPPDEFINES = 'GALLIUM_LLVMPIPE')
|
||||||
|
@@ -20,7 +20,7 @@ env.Append(CPPPATH = [
|
|||||||
'#src/gallium/winsys',
|
'#src/gallium/winsys',
|
||||||
])
|
])
|
||||||
|
|
||||||
env.Append(CPPDEFINES = ['GALLIUM_RBUG', 'GALLIUM_TRACE', 'GALLIUM_GALAHAD'])
|
env.Append(CPPDEFINES = ['GALLIUM_RBUG', 'GALLIUM_TRACE'])
|
||||||
|
|
||||||
sources = [
|
sources = [
|
||||||
'graw_xlib.c',
|
'graw_xlib.c',
|
||||||
@@ -28,8 +28,8 @@ sources = [
|
|||||||
]
|
]
|
||||||
|
|
||||||
if True:
|
if True:
|
||||||
env.Append(CPPDEFINES = ['GALLIUM_TRACE', 'GALLIUM_RBUG', 'GALLIUM_GALAHAD', 'GALLIUM_SOFTPIPE'])
|
env.Append(CPPDEFINES = ['GALLIUM_TRACE', 'GALLIUM_RBUG', 'GALLIUM_SOFTPIPE'])
|
||||||
env.Prepend(LIBS = [trace, rbug, galahad, softpipe])
|
env.Prepend(LIBS = [trace, rbug, softpipe])
|
||||||
|
|
||||||
if env['llvm']:
|
if env['llvm']:
|
||||||
env.Append(CPPDEFINES = 'GALLIUM_LLVMPIPE')
|
env.Append(CPPDEFINES = 'GALLIUM_LLVMPIPE')
|
||||||
|
@@ -37,8 +37,8 @@ AM_CPPFLAGS = \
|
|||||||
-I$(top_srcdir)/src/gallium/winsys \
|
-I$(top_srcdir)/src/gallium/winsys \
|
||||||
-DGALLIUM_SOFTPIPE \
|
-DGALLIUM_SOFTPIPE \
|
||||||
-DGALLIUM_RBUG \
|
-DGALLIUM_RBUG \
|
||||||
-DGALLIUM_TRACE \
|
-DGALLIUM_TRACE
|
||||||
-DGALLIUM_GALAHAD
|
|
||||||
AM_CFLAGS = $(X11_INCLUDES)
|
AM_CFLAGS = $(X11_INCLUDES)
|
||||||
|
|
||||||
lib_LTLIBRARIES = lib@GL_LIB@.la
|
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/softpipe/libsoftpipe.la \
|
||||||
$(top_builddir)/src/gallium/drivers/trace/libtrace.la \
|
$(top_builddir)/src/gallium/drivers/trace/libtrace.la \
|
||||||
$(top_builddir)/src/gallium/drivers/rbug/librbug.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/mapi/glapi/libglapi.la \
|
||||||
$(top_builddir)/src/mesa/libmesagallium.la \
|
$(top_builddir)/src/mesa/libmesagallium.la \
|
||||||
$(top_builddir)/src/gallium/auxiliary/libgallium.la \
|
$(top_builddir)/src/gallium/auxiliary/libgallium.la \
|
||||||
|
@@ -39,8 +39,8 @@ sources = [
|
|||||||
]
|
]
|
||||||
|
|
||||||
if True:
|
if True:
|
||||||
env.Append(CPPDEFINES = ['GALLIUM_TRACE', 'GALLIUM_RBUG', 'GALLIUM_GALAHAD', 'GALLIUM_SOFTPIPE'])
|
env.Append(CPPDEFINES = ['GALLIUM_TRACE', 'GALLIUM_RBUG', 'GALLIUM_SOFTPIPE'])
|
||||||
env.Prepend(LIBS = [trace, rbug, galahad, softpipe])
|
env.Prepend(LIBS = [trace, rbug, softpipe])
|
||||||
|
|
||||||
if env['llvm']:
|
if env['llvm']:
|
||||||
env.Append(CPPDEFINES = ['GALLIUM_LLVMPIPE'])
|
env.Append(CPPDEFINES = ['GALLIUM_LLVMPIPE'])
|
||||||
|
@@ -30,8 +30,7 @@ AM_CPPFLAGS = \
|
|||||||
$(LIBDRM_CFLAGS) \
|
$(LIBDRM_CFLAGS) \
|
||||||
$(VISIBILITY_CFLAGS) \
|
$(VISIBILITY_CFLAGS) \
|
||||||
-DGALLIUM_RBUG \
|
-DGALLIUM_RBUG \
|
||||||
-DGALLIUM_TRACE \
|
-DGALLIUM_TRACE
|
||||||
-DGALLIUM_GALAHAD
|
|
||||||
|
|
||||||
pipedir = $(libdir)/gallium-pipe
|
pipedir = $(libdir)/gallium-pipe
|
||||||
pipe_LTLIBRARIES =
|
pipe_LTLIBRARIES =
|
||||||
@@ -56,7 +55,6 @@ PIPE_LIBS += \
|
|||||||
$(top_builddir)/src/util/libmesautil.la \
|
$(top_builddir)/src/util/libmesautil.la \
|
||||||
$(top_builddir)/src/gallium/drivers/rbug/librbug.la \
|
$(top_builddir)/src/gallium/drivers/rbug/librbug.la \
|
||||||
$(top_builddir)/src/gallium/drivers/trace/libtrace.la \
|
$(top_builddir)/src/gallium/drivers/trace/libtrace.la \
|
||||||
$(top_builddir)/src/gallium/drivers/galahad/libgalahad.la \
|
|
||||||
$(GALLIUM_COMMON_LIB_DEPS)
|
$(GALLIUM_COMMON_LIB_DEPS)
|
||||||
|
|
||||||
AM_LDFLAGS = \
|
AM_LDFLAGS = \
|
||||||
|
Reference in New Issue
Block a user