OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

galahad: remove driver

Browse Source 
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Acked-by: Matt Turner <mattst88@gmail.com>
This commit is contained in:
Emil Velikov
2015-03-14 22:36:31 +00:00
parent 84041bab3f
commit 429a435525
13 changed files with 12 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@@ -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

1
src/gallium/Makefile.am
View File

@@ -11,7 +11,6 @@ SUBDIRS += auxiliary
##
SUBDIRS += \
drivers/galahad \
drivers/noop \
drivers/trace \
drivers/rbug

1
src/gallium/SConscript
View File

@@ -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',

8
src/gallium/auxiliary/target-helpers/inline_debug_helper.h
View File

@@ -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

4
src/gallium/docs/source/debugging.rst
View File

@@ -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.

9
src/gallium/docs/source/distro.rst
View File

@@ -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
--------------

2
src/gallium/targets/dri/Makefile.am
View File

@@ -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 \

4
src/gallium/targets/dri/SConscript
View File

@@ -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')

4
src/gallium/targets/graw-gdi/SConscript
View File

@@ -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')

6
src/gallium/targets/graw-xlib/SConscript
View File

@@ -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')

5
src/gallium/targets/libgl-xlib/Makefile.am
View File

@@ -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 \

4
src/gallium/targets/libgl-xlib/SConscript
View File

@@ -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'])

4
src/gallium/targets/pipe-loader/Makefile.am
View File

@@ -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 = \