diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2018-04-07 14:01:12 -0400 |
|---|---|---|
| committer | Marek Olšák <marek.olsak@amd.com> | 2018-04-13 14:08:14 -0400 |
| commit | 6ff0c6f4ebcb87ea6c6fe5a4ba90b548f666067d (patch) | |
| tree | 30926986da28bb0b67b857d8f2cf7eeaa77f8773 /src | |
| parent | 918b798668c5465d85ca542423e4cf525dc79b31 (diff) | |
gallium: move ddebug, noop, rbug, trace to auxiliary to improve build times
which also simplifies the build scripts.
Diffstat (limited to 'src')
78 files changed, 96 insertions, 382 deletions
diff --git a/src/gallium/Makefile.am b/src/gallium/Makefile.am index f1fd22cece..e2e8eaece1 100644 --- a/src/gallium/Makefile.am +++ b/src/gallium/Makefile.am @@ -11,12 +11,6 @@ SUBDIRS += auxiliary/pipe-loader ## Gallium pipe drivers and their respective winsys' ## -SUBDIRS += \ - drivers/ddebug \ - drivers/noop \ - drivers/trace \ - drivers/rbug - ## freedreno/msm/kgsl if HAVE_GALLIUM_FREEDRENO SUBDIRS += drivers/freedreno winsys/freedreno/drm diff --git a/src/gallium/SConscript b/src/gallium/SConscript index 9273db7e49..358c31e847 100644 --- a/src/gallium/SConscript +++ b/src/gallium/SConscript @@ -14,10 +14,8 @@ SConscript('auxiliary/pipe-loader/SConscript') # These are common and work across all platforms SConscript([ 'drivers/llvmpipe/SConscript', - 'drivers/rbug/SConscript', 'drivers/softpipe/SConscript', 'drivers/svga/SConscript', - 'drivers/trace/SConscript', 'drivers/swr/SConscript', ]) diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am index 95a325f96b..07856e5a52 100644 --- a/src/gallium/auxiliary/Makefile.am +++ b/src/gallium/auxiliary/Makefile.am @@ -108,6 +108,9 @@ endif # NEED_GALLIUM_VL EXTRA_DIST = \ SConscript \ + driver_rbug/README \ + driver_trace/README \ + driver_trace/trace.xsl \ indices/u_indices.c \ indices/u_unfilled_indices.c \ indices/u_indices_gen.py \ diff --git a/src/gallium/auxiliary/Makefile.sources b/src/gallium/auxiliary/Makefile.sources index d70eb04e79..066746f2d0 100644 --- a/src/gallium/auxiliary/Makefile.sources +++ b/src/gallium/auxiliary/Makefile.sources @@ -57,6 +57,35 @@ C_SOURCES := \ draw/draw_vs_exec.c \ draw/draw_vs.h \ draw/draw_vs_variant.c \ + driver_ddebug/dd_context.c \ + driver_ddebug/dd_draw.c \ + driver_ddebug/dd_pipe.h \ + driver_ddebug/dd_public.h \ + driver_ddebug/dd_screen.c \ + driver_ddebug/dd_util.h \ + driver_noop/noop_pipe.c \ + driver_noop/noop_public.h \ + driver_noop/noop_state.c \ + driver_rbug/rbug_context.c \ + driver_rbug/rbug_context.h \ + driver_rbug/rbug_core.c \ + driver_rbug/rbug_objects.c \ + driver_rbug/rbug_objects.h \ + driver_rbug/rbug_public.h \ + driver_rbug/rbug_screen.c \ + driver_rbug/rbug_screen.h \ + driver_trace/tr_context.c \ + driver_trace/tr_context.h \ + driver_trace/tr_dump.c \ + driver_trace/tr_dump_defines.h \ + driver_trace/tr_dump.h \ + driver_trace/tr_dump_state.c \ + driver_trace/tr_dump_state.h \ + driver_trace/tr_public.h \ + driver_trace/tr_screen.c \ + driver_trace/tr_screen.h \ + driver_trace/tr_texture.c \ + driver_trace/tr_texture.h \ hud/font.c \ hud/font.h \ hud/hud_context.c \ diff --git a/src/gallium/drivers/ddebug/dd_context.c b/src/gallium/auxiliary/driver_ddebug/dd_context.c index dd7b3e086c..dd7b3e086c 100644 --- a/src/gallium/drivers/ddebug/dd_context.c +++ b/src/gallium/auxiliary/driver_ddebug/dd_context.c diff --git a/src/gallium/drivers/ddebug/dd_draw.c b/src/gallium/auxiliary/driver_ddebug/dd_draw.c index c404ea0607..c404ea0607 100644 --- a/src/gallium/drivers/ddebug/dd_draw.c +++ b/src/gallium/auxiliary/driver_ddebug/dd_draw.c diff --git a/src/gallium/drivers/ddebug/dd_pipe.h b/src/gallium/auxiliary/driver_ddebug/dd_pipe.h index 07c4d55017..07c4d55017 100644 --- a/src/gallium/drivers/ddebug/dd_pipe.h +++ b/src/gallium/auxiliary/driver_ddebug/dd_pipe.h diff --git a/src/gallium/drivers/ddebug/dd_public.h b/src/gallium/auxiliary/driver_ddebug/dd_public.h index e660765575..e660765575 100644 --- a/src/gallium/drivers/ddebug/dd_public.h +++ b/src/gallium/auxiliary/driver_ddebug/dd_public.h diff --git a/src/gallium/drivers/ddebug/dd_screen.c b/src/gallium/auxiliary/driver_ddebug/dd_screen.c index 5b2be28a96..5b2be28a96 100644 --- a/src/gallium/drivers/ddebug/dd_screen.c +++ b/src/gallium/auxiliary/driver_ddebug/dd_screen.c diff --git a/src/gallium/drivers/ddebug/dd_util.h b/src/gallium/auxiliary/driver_ddebug/dd_util.h index bdfb7cc916..bdfb7cc916 100644 --- a/src/gallium/drivers/ddebug/dd_util.h +++ b/src/gallium/auxiliary/driver_ddebug/dd_util.h diff --git a/src/gallium/drivers/noop/noop_pipe.c b/src/gallium/auxiliary/driver_noop/noop_pipe.c index d1e795dab1..d1e795dab1 100644 --- a/src/gallium/drivers/noop/noop_pipe.c +++ b/src/gallium/auxiliary/driver_noop/noop_pipe.c diff --git a/src/gallium/drivers/noop/noop_public.h b/src/gallium/auxiliary/driver_noop/noop_public.h index 180ea597fa..180ea597fa 100644 --- a/src/gallium/drivers/noop/noop_public.h +++ b/src/gallium/auxiliary/driver_noop/noop_public.h diff --git a/src/gallium/drivers/noop/noop_state.c b/src/gallium/auxiliary/driver_noop/noop_state.c index 80cfae8ad4..80cfae8ad4 100644 --- a/src/gallium/drivers/noop/noop_state.c +++ b/src/gallium/auxiliary/driver_noop/noop_state.c diff --git a/src/gallium/drivers/rbug/README b/src/gallium/auxiliary/driver_rbug/README index 0edf0ad89d..0edf0ad89d 100644 --- a/src/gallium/drivers/rbug/README +++ b/src/gallium/auxiliary/driver_rbug/README diff --git a/src/gallium/drivers/rbug/rbug_context.c b/src/gallium/auxiliary/driver_rbug/rbug_context.c index e1f3c4f284..e1f3c4f284 100644 --- a/src/gallium/drivers/rbug/rbug_context.c +++ b/src/gallium/auxiliary/driver_rbug/rbug_context.c diff --git a/src/gallium/drivers/rbug/rbug_context.h b/src/gallium/auxiliary/driver_rbug/rbug_context.h index e89c6eaac0..e89c6eaac0 100644 --- a/src/gallium/drivers/rbug/rbug_context.h +++ b/src/gallium/auxiliary/driver_rbug/rbug_context.h diff --git a/src/gallium/drivers/rbug/rbug_core.c b/src/gallium/auxiliary/driver_rbug/rbug_core.c index 76394039b9..76394039b9 100644 --- a/src/gallium/drivers/rbug/rbug_core.c +++ b/src/gallium/auxiliary/driver_rbug/rbug_core.c diff --git a/src/gallium/drivers/rbug/rbug_objects.c b/src/gallium/auxiliary/driver_rbug/rbug_objects.c index 2aa4e123f8..2aa4e123f8 100644 --- a/src/gallium/drivers/rbug/rbug_objects.c +++ b/src/gallium/auxiliary/driver_rbug/rbug_objects.c diff --git a/src/gallium/drivers/rbug/rbug_objects.h b/src/gallium/auxiliary/driver_rbug/rbug_objects.h index 02973e0799..02973e0799 100644 --- a/src/gallium/drivers/rbug/rbug_objects.h +++ b/src/gallium/auxiliary/driver_rbug/rbug_objects.h diff --git a/src/gallium/drivers/rbug/rbug_public.h b/src/gallium/auxiliary/driver_rbug/rbug_public.h index 83f9c94e31..83f9c94e31 100644 --- a/src/gallium/drivers/rbug/rbug_public.h +++ b/src/gallium/auxiliary/driver_rbug/rbug_public.h diff --git a/src/gallium/drivers/rbug/rbug_screen.c b/src/gallium/auxiliary/driver_rbug/rbug_screen.c index 2477edbadf..2477edbadf 100644 --- a/src/gallium/drivers/rbug/rbug_screen.c +++ b/src/gallium/auxiliary/driver_rbug/rbug_screen.c diff --git a/src/gallium/drivers/rbug/rbug_screen.h b/src/gallium/auxiliary/driver_rbug/rbug_screen.h index 1972005753..1972005753 100644 --- a/src/gallium/drivers/rbug/rbug_screen.h +++ b/src/gallium/auxiliary/driver_rbug/rbug_screen.h diff --git a/src/gallium/drivers/trace/README b/src/gallium/auxiliary/driver_trace/README index cacd2e1749..fbad26c449 100644 --- a/src/gallium/drivers/trace/README +++ b/src/gallium/auxiliary/driver_trace/README @@ -28,7 +28,7 @@ For long traces you can use the For remote debugging see: - src/gallium/drivers/rbug/README + src/gallium/auxiliary/driver_rbug/README = Integrating = diff --git a/src/gallium/drivers/trace/tr_context.c b/src/gallium/auxiliary/driver_trace/tr_context.c index 6d918d42a3..6d918d42a3 100644 --- a/src/gallium/drivers/trace/tr_context.c +++ b/src/gallium/auxiliary/driver_trace/tr_context.c diff --git a/src/gallium/drivers/trace/tr_context.h b/src/gallium/auxiliary/driver_trace/tr_context.h index ad57d9d524..ad57d9d524 100644 --- a/src/gallium/drivers/trace/tr_context.h +++ b/src/gallium/auxiliary/driver_trace/tr_context.h diff --git a/src/gallium/drivers/trace/tr_dump.c b/src/gallium/auxiliary/driver_trace/tr_dump.c index 49349496ac..49349496ac 100644 --- a/src/gallium/drivers/trace/tr_dump.c +++ b/src/gallium/auxiliary/driver_trace/tr_dump.c diff --git a/src/gallium/drivers/trace/tr_dump.h b/src/gallium/auxiliary/driver_trace/tr_dump.h index 7a268e31c4..7a268e31c4 100644 --- a/src/gallium/drivers/trace/tr_dump.h +++ b/src/gallium/auxiliary/driver_trace/tr_dump.h diff --git a/src/gallium/drivers/trace/tr_dump_defines.h b/src/gallium/auxiliary/driver_trace/tr_dump_defines.h index 7f969a3033..7f969a3033 100644 --- a/src/gallium/drivers/trace/tr_dump_defines.h +++ b/src/gallium/auxiliary/driver_trace/tr_dump_defines.h diff --git a/src/gallium/drivers/trace/tr_dump_state.c b/src/gallium/auxiliary/driver_trace/tr_dump_state.c index e7e32237c4..e7e32237c4 100644 --- a/src/gallium/drivers/trace/tr_dump_state.c +++ b/src/gallium/auxiliary/driver_trace/tr_dump_state.c diff --git a/src/gallium/drivers/trace/tr_dump_state.h b/src/gallium/auxiliary/driver_trace/tr_dump_state.h index baff0252f9..baff0252f9 100644 --- a/src/gallium/drivers/trace/tr_dump_state.h +++ b/src/gallium/auxiliary/driver_trace/tr_dump_state.h diff --git a/src/gallium/drivers/trace/tr_public.h b/src/gallium/auxiliary/driver_trace/tr_public.h index b03133f8d9..b03133f8d9 100644 --- a/src/gallium/drivers/trace/tr_public.h +++ b/src/gallium/auxiliary/driver_trace/tr_public.h diff --git a/src/gallium/drivers/trace/tr_screen.c b/src/gallium/auxiliary/driver_trace/tr_screen.c index d5a81249b5..d5a81249b5 100644 --- a/src/gallium/drivers/trace/tr_screen.c +++ b/src/gallium/auxiliary/driver_trace/tr_screen.c diff --git a/src/gallium/drivers/trace/tr_screen.h b/src/gallium/auxiliary/driver_trace/tr_screen.h index 65ea4fb6a4..65ea4fb6a4 100644 --- a/src/gallium/drivers/trace/tr_screen.h +++ b/src/gallium/auxiliary/driver_trace/tr_screen.h diff --git a/src/gallium/drivers/trace/tr_texture.c b/src/gallium/auxiliary/driver_trace/tr_texture.c index fe0c7b52c9..fe0c7b52c9 100644 --- a/src/gallium/drivers/trace/tr_texture.c +++ b/src/gallium/auxiliary/driver_trace/tr_texture.c diff --git a/src/gallium/drivers/trace/tr_texture.h b/src/gallium/auxiliary/driver_trace/tr_texture.h index e5dfc53fdb..e5dfc53fdb 100644 --- a/src/gallium/drivers/trace/tr_texture.h +++ b/src/gallium/auxiliary/driver_trace/tr_texture.h diff --git a/src/gallium/drivers/trace/trace.xsl b/src/gallium/auxiliary/driver_trace/trace.xsl index 12458ae328..12458ae328 100644 --- a/src/gallium/drivers/trace/trace.xsl +++ b/src/gallium/auxiliary/driver_trace/trace.xsl diff --git a/src/gallium/auxiliary/meson.build b/src/gallium/auxiliary/meson.build index 53c85046ed..92cfb8f7af 100644 --- a/src/gallium/auxiliary/meson.build +++ b/src/gallium/auxiliary/meson.build @@ -77,6 +77,35 @@ files_libgallium = files( 'draw/draw_vs_exec.c', 'draw/draw_vs.h', 'draw/draw_vs_variant.c', + 'driver_ddebug/dd_context.c', + 'driver_ddebug/dd_draw.c', + 'driver_ddebug/dd_pipe.h', + 'driver_ddebug/dd_public.h', + 'driver_ddebug/dd_screen.c', + 'driver_ddebug/dd_util.h', + 'driver_noop/noop_pipe.c', + 'driver_noop/noop_public.h', + 'driver_noop/noop_state.c', + 'driver_rbug/rbug_context.c', + 'driver_rbug/rbug_context.h', + 'driver_rbug/rbug_core.c', + 'driver_rbug/rbug_objects.c', + 'driver_rbug/rbug_objects.h', + 'driver_rbug/rbug_public.h', + 'driver_rbug/rbug_screen.c', + 'driver_rbug/rbug_screen.h', + 'driver_trace/tr_context.c', + 'driver_trace/tr_context.h', + 'driver_trace/tr_dump.c', + 'driver_trace/tr_dump_defines.h', + 'driver_trace/tr_dump.h', + 'driver_trace/tr_dump_state.c', + 'driver_trace/tr_dump_state.h', + 'driver_trace/tr_public.h', + 'driver_trace/tr_screen.c', + 'driver_trace/tr_screen.h', + 'driver_trace/tr_texture.c', + 'driver_trace/tr_texture.h', 'hud/font.c', 'hud/font.h', 'hud/hud_context.c', diff --git a/src/gallium/auxiliary/rbug/README b/src/gallium/auxiliary/rbug/README index c5156438a1..0c41c8c3fa 100644 --- a/src/gallium/auxiliary/rbug/README +++ b/src/gallium/auxiliary/rbug/README @@ -10,7 +10,7 @@ The code currently uses tcp and ip4v for connections. Information about driver integration can be found in: -src/gallium/drivers/rbug/README +src/gallium/auxiliary/driver_rbug/README for information about applications look in: diff --git a/src/gallium/auxiliary/target-helpers/inline_debug_helper.h b/src/gallium/auxiliary/target-helpers/inline_debug_helper.h index 2443bf2146..66d46de888 100644 --- a/src/gallium/auxiliary/target-helpers/inline_debug_helper.h +++ b/src/gallium/auxiliary/target-helpers/inline_debug_helper.h @@ -8,24 +8,13 @@ /* Helper function to wrap a screen with - * one or more debug driver: rbug, trace. + * one or more debug drivers. */ -#ifdef GALLIUM_DDEBUG -#include "ddebug/dd_public.h" -#endif - -#ifdef GALLIUM_TRACE -#include "trace/tr_public.h" -#endif - -#ifdef GALLIUM_RBUG -#include "rbug/rbug_public.h" -#endif - -#ifdef GALLIUM_NOOP -#include "noop/noop_public.h" -#endif +#include "driver_ddebug/dd_public.h" +#include "driver_trace/tr_public.h" +#include "driver_rbug/rbug_public.h" +#include "driver_noop/noop_public.h" /* * TODO: Audit the following *screen_create() - all of @@ -34,21 +23,10 @@ static inline struct pipe_screen * debug_screen_wrap(struct pipe_screen *screen) { -#if defined(GALLIUM_DDEBUG) screen = ddebug_screen_create(screen); -#endif - -#if defined(GALLIUM_RBUG) screen = rbug_screen_create(screen); -#endif - -#if defined(GALLIUM_TRACE) screen = trace_screen_create(screen); -#endif - -#if defined(GALLIUM_NOOP) screen = noop_screen_create(screen); -#endif if (debug_get_bool_option("GALLIUM_TESTS", FALSE)) util_run_tests(screen); diff --git a/src/gallium/drivers/ddebug/Makefile.am b/src/gallium/drivers/ddebug/Makefile.am deleted file mode 100644 index b36ea239af..0000000000 --- a/src/gallium/drivers/ddebug/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -include Makefile.sources -include $(top_srcdir)/src/gallium/Automake.inc - -AM_CFLAGS = \ - $(GALLIUM_DRIVER_CFLAGS) - -noinst_LTLIBRARIES = libddebug.la - -libddebug_la_SOURCES = $(C_SOURCES) - -EXTRA_DIST = meson.build diff --git a/src/gallium/drivers/ddebug/Makefile.sources b/src/gallium/drivers/ddebug/Makefile.sources deleted file mode 100644 index 1bd38274df..0000000000 --- a/src/gallium/drivers/ddebug/Makefile.sources +++ /dev/null @@ -1,7 +0,0 @@ -C_SOURCES := \ - dd_context.c \ - dd_draw.c \ - dd_pipe.h \ - dd_public.h \ - dd_screen.c \ - dd_util.h diff --git a/src/gallium/drivers/ddebug/meson.build b/src/gallium/drivers/ddebug/meson.build deleted file mode 100644 index 09ede3d04d..0000000000 --- a/src/gallium/drivers/ddebug/meson.build +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright © 2017 Dylan Baker - -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: - -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. - -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. - -libddebug = static_library( - 'ddebug', - files('dd_context.c', 'dd_draw.c', 'dd_pipe.h', 'dd_public.h', 'dd_screen.c', - 'dd_util.h'), - c_args : [c_vis_args], - include_directories : [inc_gallium, inc_include, inc_src, inc_gallium_aux], - build_by_default : false, -) diff --git a/src/gallium/drivers/noop/Makefile.am b/src/gallium/drivers/noop/Makefile.am deleted file mode 100644 index 1a4354e0b4..0000000000 --- a/src/gallium/drivers/noop/Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ - -# Meta-driver which combines whichever software rasterizers have been -# built into a single convenience library. - -include Makefile.sources -include $(top_srcdir)/src/gallium/Automake.inc - -AM_CFLAGS = \ - $(GALLIUM_DRIVER_CFLAGS) - -noinst_LTLIBRARIES = libnoop.la - -libnoop_la_SOURCES = $(C_SOURCES) - -EXTRA_DIST = SConscript meson.build diff --git a/src/gallium/drivers/noop/Makefile.sources b/src/gallium/drivers/noop/Makefile.sources deleted file mode 100644 index 6d4228630b..0000000000 --- a/src/gallium/drivers/noop/Makefile.sources +++ /dev/null @@ -1,4 +0,0 @@ -C_SOURCES := \ - noop_pipe.c \ - noop_public.h \ - noop_state.c diff --git a/src/gallium/drivers/noop/SConscript b/src/gallium/drivers/noop/SConscript deleted file mode 100644 index 9cb2e29cbe..0000000000 --- a/src/gallium/drivers/noop/SConscript +++ /dev/null @@ -1,13 +0,0 @@ -####################################################################### -# SConscript for noop convenience library - -Import('*') - -env = env.Clone() - -noop = env.ConvenienceLibrary( - target = 'noop', - source = env.ParseSourceList('Makefile.sources', 'C_SOURCES') - ) + extra - -Export('noop') diff --git a/src/gallium/drivers/noop/meson.build b/src/gallium/drivers/noop/meson.build deleted file mode 100644 index c4bb1508e3..0000000000 --- a/src/gallium/drivers/noop/meson.build +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright © 2017 Dylan Baker - -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: - -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. - -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. - -libnoop = static_library( - 'noop', - files('noop_pipe.c', 'noop_public.h', 'noop_state.c'), - c_args : [c_vis_args], - include_directories : [inc_gallium, inc_include, inc_src, inc_gallium_aux], - build_by_default : false, -) diff --git a/src/gallium/drivers/radeonsi/si_debug.c b/src/gallium/drivers/radeonsi/si_debug.c index 817a6d5ee9..b7d40db21c 100644 --- a/src/gallium/drivers/radeonsi/si_debug.c +++ b/src/gallium/drivers/radeonsi/si_debug.c @@ -27,7 +27,7 @@ #include "sid.h" #include "gfx9d.h" #include "sid_tables.h" -#include "ddebug/dd_util.h" +#include "driver_ddebug/dd_util.h" #include "util/u_dump.h" #include "util/u_log.h" #include "util/u_memory.h" diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c index 4928e6f5f3..466546b76b 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.c +++ b/src/gallium/drivers/radeonsi/si_pipe.c @@ -37,7 +37,7 @@ #include "util/u_upload_mgr.h" #include "util/xmlconfig.h" #include "vl/vl_decoder.h" -#include "../ddebug/dd_util.h" +#include "driver_ddebug/dd_util.h" static const struct debug_named_value debug_options[] = { /* Shader logging options: */ diff --git a/src/gallium/drivers/rbug/Makefile.am b/src/gallium/drivers/rbug/Makefile.am deleted file mode 100644 index c784d84232..0000000000 --- a/src/gallium/drivers/rbug/Makefile.am +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright © 2012 Intel Corporation -# -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# and/or sell copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice (including the next -# paragraph) shall be included in all copies or substantial portions of the -# Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -# DEALINGS IN THE SOFTWARE. - -include Makefile.sources -include $(top_srcdir)/src/gallium/Automake.inc - -AM_CFLAGS = \ - $(GALLIUM_DRIVER_CFLAGS) - -noinst_LTLIBRARIES = librbug.la - -librbug_la_SOURCES = $(C_SOURCES) - -EXTRA_DIST = SConscript README meson.build diff --git a/src/gallium/drivers/rbug/Makefile.sources b/src/gallium/drivers/rbug/Makefile.sources deleted file mode 100644 index f9f1d5c3a4..0000000000 --- a/src/gallium/drivers/rbug/Makefile.sources +++ /dev/null @@ -1,9 +0,0 @@ -C_SOURCES := \ - rbug_context.c \ - rbug_context.h \ - rbug_core.c \ - rbug_objects.c \ - rbug_objects.h \ - rbug_public.h \ - rbug_screen.c \ - rbug_screen.h diff --git a/src/gallium/drivers/rbug/SConscript b/src/gallium/drivers/rbug/SConscript deleted file mode 100644 index 63209abac2..0000000000 --- a/src/gallium/drivers/rbug/SConscript +++ /dev/null @@ -1,12 +0,0 @@ -Import('*') - -env = env.Clone() - -rbug = env.ConvenienceLibrary( - target = 'rbug', - source = env.ParseSourceList('Makefile.sources', 'C_SOURCES') - ) - -env.Alias('rbug', rbug) - -Export('rbug') diff --git a/src/gallium/drivers/rbug/meson.build b/src/gallium/drivers/rbug/meson.build deleted file mode 100644 index 9c74171f7b..0000000000 --- a/src/gallium/drivers/rbug/meson.build +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright © 2017 Dylan Baker - -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: - -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. - -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. - -librbug = static_library( - 'rbug', - files('rbug_context.c', 'rbug_context.h', 'rbug_core.c', 'rbug_objects.c', - 'rbug_objects.h', 'rbug_public.h', 'rbug_screen.c', 'rbug_screen.h'), - include_directories : [inc_gallium, inc_gallium_aux, inc_include, inc_src], - c_args : [c_vis_args], - build_by_default : false, -) diff --git a/src/gallium/drivers/trace/Makefile.am b/src/gallium/drivers/trace/Makefile.am deleted file mode 100644 index 9c834a6d52..0000000000 --- a/src/gallium/drivers/trace/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -include Makefile.sources -include $(top_srcdir)/src/gallium/Automake.inc - -AM_CFLAGS = \ - $(GALLIUM_DRIVER_CFLAGS) \ - $(MSVC2013_COMPAT_CFLAGS) - -noinst_LTLIBRARIES = libtrace.la - -libtrace_la_SOURCES = $(C_SOURCES) - -EXTRA_DIST = SConscript \ - README \ - trace.xsl \ - meson.build diff --git a/src/gallium/drivers/trace/Makefile.sources b/src/gallium/drivers/trace/Makefile.sources deleted file mode 100644 index 4c019a3bc6..0000000000 --- a/src/gallium/drivers/trace/Makefile.sources +++ /dev/null @@ -1,13 +0,0 @@ -C_SOURCES := \ - tr_context.c \ - tr_context.h \ - tr_dump.c \ - tr_dump_defines.h \ - tr_dump.h \ - tr_dump_state.c \ - tr_dump_state.h \ - tr_public.h \ - tr_screen.c \ - tr_screen.h \ - tr_texture.c \ - tr_texture.h diff --git a/src/gallium/drivers/trace/SConscript b/src/gallium/drivers/trace/SConscript deleted file mode 100644 index 7397983647..0000000000 --- a/src/gallium/drivers/trace/SConscript +++ /dev/null @@ -1,14 +0,0 @@ -Import('*') - -env = env.Clone() - -env.MSVC2013Compat() - -trace = env.ConvenienceLibrary( - target = 'trace', - source = env.ParseSourceList('Makefile.sources', 'C_SOURCES') - ) - -env.Alias('trace', trace) - -Export('trace') diff --git a/src/gallium/drivers/trace/meson.build b/src/gallium/drivers/trace/meson.build deleted file mode 100644 index 4fc5d8ba0f..0000000000 --- a/src/gallium/drivers/trace/meson.build +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright © 2017 Dylan Baker - -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: - -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. - -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. - -libtrace = static_library( - 'trace', - files('tr_context.c', 'tr_context.h', 'tr_dump.c', 'tr_dump_defines.h', - 'tr_dump.h', 'tr_dump_state.c', 'tr_dump_state.h', 'tr_public.h', - 'tr_screen.c', 'tr_screen.h', 'tr_texture.c', 'tr_texture.h'), - c_args : [c_msvc_compat_args, c_vis_args], - include_directories : [inc_gallium, inc_gallium_aux, inc_include, inc_src], - build_by_default : false, -) diff --git a/src/gallium/meson.build b/src/gallium/meson.build index 68225112c5..c4dd8e1c26 100644 --- a/src/gallium/meson.build +++ b/src/gallium/meson.build @@ -24,10 +24,6 @@ inc_gallium_winsys = include_directories('winsys') subdir('auxiliary') subdir('auxiliary/pipe-loader') -subdir('drivers/ddebug') -subdir('drivers/noop') -subdir('drivers/trace') -subdir('drivers/rbug') subdir('winsys/sw/null') if with_dri subdir('winsys/sw/dri') diff --git a/src/gallium/state_trackers/osmesa/Makefile.am b/src/gallium/state_trackers/osmesa/Makefile.am index e5f2a5e18a..05e3ca0d73 100644 --- a/src/gallium/state_trackers/osmesa/Makefile.am +++ b/src/gallium/state_trackers/osmesa/Makefile.am @@ -33,8 +33,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/gallium/winsys \ -I$(top_srcdir)/src/gallium/state_trackers/glx/xlib \ -I$(top_srcdir)/src/gallium/auxiliary \ - -DGALLIUM_SOFTPIPE \ - -DGALLIUM_TRACE + -DGALLIUM_SOFTPIPE noinst_LTLIBRARIES = libosmesa.la diff --git a/src/gallium/state_trackers/osmesa/meson.build b/src/gallium/state_trackers/osmesa/meson.build index dacf10512d..912a6226f7 100644 --- a/src/gallium/state_trackers/osmesa/meson.build +++ b/src/gallium/state_trackers/osmesa/meson.build @@ -21,7 +21,7 @@ libosmesa_st = static_library( 'osmesa_st', 'osmesa.c', - c_args : ['-DGALLIUM_SOFTPIPE', '-DGALLIUM_TRACE'], + c_args : ['-DGALLIUM_SOFTPIPE'], include_directories : [ inc_include, inc_src, inc_gallium, inc_gallium_aux, inc_mapi, inc_mesa, ], diff --git a/src/gallium/targets/d3dadapter9/Makefile.am b/src/gallium/targets/d3dadapter9/Makefile.am index c2aae0c780..69cebbcd16 100644 --- a/src/gallium/targets/d3dadapter9/Makefile.am +++ b/src/gallium/targets/d3dadapter9/Makefile.am @@ -35,10 +35,7 @@ AM_CFLAGS = \ $(VISIBILITY_CFLAGS) AM_CPPFLAGS = \ - $(DEFINES) \ - -DGALLIUM_DDEBUG \ - -DGALLIUM_RBUG \ - -DGALLIUM_TRACE + $(DEFINES) ninedir = $(D3D_DRIVER_INSTALL_DIR) nine_LTLIBRARIES = d3dadapter9.la @@ -70,9 +67,6 @@ d3dadapter9_la_LIBADD = \ $(top_builddir)/src/gallium/auxiliary/libgallium.la \ $(top_builddir)/src/gallium/state_trackers/nine/libninetracker.la \ $(top_builddir)/src/util/libmesautil.la \ - $(top_builddir)/src/gallium/drivers/ddebug/libddebug.la \ - $(top_builddir)/src/gallium/drivers/rbug/librbug.la \ - $(top_builddir)/src/gallium/drivers/trace/libtrace.la \ $(EXPAT_LIBS) \ $(GALLIUM_COMMON_LIB_DEPS) diff --git a/src/gallium/targets/d3dadapter9/meson.build b/src/gallium/targets/d3dadapter9/meson.build index 2cdc0e0e1f..bd05b4f969 100644 --- a/src/gallium/targets/d3dadapter9/meson.build +++ b/src/gallium/targets/d3dadapter9/meson.build @@ -25,11 +25,7 @@ nine_version = ['1', '0', '0'] -gallium_nine_c_args = [ - '-DGALLIUM_DDEBUG', - '-DGALLIUM_RBUG', - '-DGALLIUME_TRACE', -] +gallium_nine_c_args = [] gallium_nine_ld_args = [] gallium_nine_link_depends = [] @@ -52,8 +48,8 @@ libgallium_nine = shared_library( link_args : [ld_args_gc_sections, gallium_nine_ld_args], link_depends : gallium_nine_link_depends, link_with : [ - libgalliumvl_stub, libgallium, libnine_st, libmesa_util, libddebug, - librbug, libtrace, libpipe_loader_static, libws_null, libwsw, libswdri, + libgalliumvl_stub, libgallium, libnine_st, libmesa_util, + libpipe_loader_static, libws_null, libwsw, libswdri, libswkmsdri, ], dependencies : [ diff --git a/src/gallium/targets/dri/Makefile.am b/src/gallium/targets/dri/Makefile.am index c6a4c21590..a0778b64e5 100644 --- a/src/gallium/targets/dri/Makefile.am +++ b/src/gallium/targets/dri/Makefile.am @@ -9,11 +9,7 @@ AM_CFLAGS = \ $(GALLIUM_TARGET_CFLAGS) AM_CPPFLAGS = \ - $(DEFINES) \ - -DGALLIUM_DDEBUG \ - -DGALLIUM_NOOP \ - -DGALLIUM_RBUG \ - -DGALLIUM_TRACE + $(DEFINES) dridir = $(DRI_DRIVER_INSTALL_DIR) dri_LTLIBRARIES = gallium_dri.la @@ -47,10 +43,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/ddebug/libddebug.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 \ $(top_builddir)/src/mapi/shared-glapi/libglapi.la \ $(LIBDRM_LIBS) \ $(SELINUX_LIBS) \ diff --git a/src/gallium/targets/dri/SConscript b/src/gallium/targets/dri/SConscript index ff6ce3bf4e..69cce3e95f 100644 --- a/src/gallium/targets/dri/SConscript +++ b/src/gallium/targets/dri/SConscript @@ -14,13 +14,6 @@ env.Append(CPPPATH = [ '#/src/gallium/state_trackers/dri', ]) -if env['build'] == 'release': - env.Append(CPPDEFINES = ['GALLIUM_RBUG']) - env.Prepend(LIBS = [rbug]) -else: - env.Append(CPPDEFINES = ['GALLIUM_TRACE', 'GALLIUM_RBUG']) - env.Prepend(LIBS = [trace, rbug]) - if env['llvm']: env.Append(CPPDEFINES = 'GALLIUM_LLVMPIPE') env.Prepend(LIBS = [llvmpipe]) diff --git a/src/gallium/targets/dri/meson.build b/src/gallium/targets/dri/meson.build index 3440297538..bdbd45839a 100644 --- a/src/gallium/targets/dri/meson.build +++ b/src/gallium/targets/dri/meson.build @@ -23,12 +23,7 @@ # Static targets are always enabled in autotools (unless you modify # configure.ac) -gallium_dri_c_args = [ - '-DGALLIUM_DDEBUG', - '-DGALLIUM_NOOP', - '-DGALLIUM_RBUG', - '-DGALLIUME_TRACE', -] +gallium_dri_c_args = [] gallium_dri_ld_args = [] gallium_dri_link_depends = [] gallium_dri_drivers = [] @@ -55,8 +50,8 @@ libgallium_dri = shared_library( link_depends : gallium_dri_link_depends, link_with : [ libmesa_gallium, libdricommon, libmegadriver_stub, libdri, libgalliumvl, - libgallium, libddebug, libnoop, librbug, libtrace, libglapi, - libpipe_loader_static, libws_null, libwsw, libswdri, libswkmsdri, + libgallium, libglapi, libpipe_loader_static, libws_null, libwsw, libswdri, + libswkmsdri, ], dependencies : [ dep_selinux, dep_expat, dep_libdrm, dep_llvm, dep_thread, diff --git a/src/gallium/targets/graw-gdi/SConscript b/src/gallium/targets/graw-gdi/SConscript index 67d437374f..e59127cc25 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_SOFTPIPE']) - env.Prepend(LIBS = [trace, rbug, softpipe]) + env.Append(CPPDEFINES = ['GALLIUM_SOFTPIPE']) + env.Prepend(LIBS = [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 bf9cf72c6e..3c6a856e30 100644 --- a/src/gallium/targets/graw-xlib/SConscript +++ b/src/gallium/targets/graw-xlib/SConscript @@ -20,16 +20,14 @@ env.Append(CPPPATH = [ '#src/gallium/winsys', ]) -env.Append(CPPDEFINES = ['GALLIUM_RBUG', 'GALLIUM_TRACE']) - sources = [ 'graw_xlib.c', graw_util ] if True: - env.Append(CPPDEFINES = ['GALLIUM_TRACE', 'GALLIUM_RBUG', 'GALLIUM_SOFTPIPE']) - env.Prepend(LIBS = [trace, rbug, softpipe]) + env.Append(CPPDEFINES = ['GALLIUM_SOFTPIPE']) + env.Prepend(LIBS = [softpipe]) if env['llvm']: env.Append(CPPDEFINES = 'GALLIUM_LLVMPIPE') diff --git a/src/gallium/targets/haiku-softpipe/SConscript b/src/gallium/targets/haiku-softpipe/SConscript index 89792fba13..ff5adc1312 100644 --- a/src/gallium/targets/haiku-softpipe/SConscript +++ b/src/gallium/targets/haiku-softpipe/SConscript @@ -3,8 +3,6 @@ Import('*') env.Prepend(LIBS = [ ws_haiku, st_haiku, - trace, - rbug, mesautil, compiler, mesa, @@ -17,8 +15,6 @@ env.Prepend(LIBS = [ if True: env.Append(CPPDEFINES = [ 'GALLIUM_SOFTPIPE', - 'GALLIUM_RBUG', - 'GALLIUM_TRACE', ]) env.Prepend(LIBS = [softpipe]) diff --git a/src/gallium/targets/haiku-softpipe/meson.build b/src/gallium/targets/haiku-softpipe/meson.build index 84bcea4bbf..619706d818 100644 --- a/src/gallium/targets/haiku-softpipe/meson.build +++ b/src/gallium/targets/haiku-softpipe/meson.build @@ -30,7 +30,7 @@ libswpipe = shared_library( cpp_args : [cpp_vis_args], link_args : [ld_args_bsymbolic, ld_args_gc_sections], link_with : [ - libglapi, libswhgl, libsthgl, libtrace, librbug, libmesa_util, libcompiler, + libglapi, libswhgl, libsthgl, libmesa_util, libcompiler, libmesa_gallium, libglsl, libnir, libgallium, libgl ], dependencies : [ diff --git a/src/gallium/targets/libgl-gdi/SConscript b/src/gallium/targets/libgl-gdi/SConscript index b5ba0fabcd..a8bdc3e586 100644 --- a/src/gallium/targets/libgl-gdi/SConscript +++ b/src/gallium/targets/libgl-gdi/SConscript @@ -45,8 +45,6 @@ if env['gcc'] and env['machine'] != 'x86_64': else: sources += ['#src/gallium/state_trackers/wgl/opengl32.def'] -drivers += [trace, rbug] - env['no_import_lib'] = 1 # when GLES is enabled, gl* and _glapi_* belong to bridge_glapi and diff --git a/src/gallium/targets/libgl-xlib/Makefile.am b/src/gallium/targets/libgl-xlib/Makefile.am index 1c622946a9..56d548e7c1 100644 --- a/src/gallium/targets/libgl-xlib/Makefile.am +++ b/src/gallium/targets/libgl-xlib/Makefile.am @@ -35,9 +35,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/gallium/state_trackers/glx/xlib \ -I$(top_srcdir)/src/gallium/auxiliary \ -I$(top_srcdir)/src/gallium/winsys \ - -DGALLIUM_SOFTPIPE \ - -DGALLIUM_RBUG \ - -DGALLIUM_TRACE + -DGALLIUM_SOFTPIPE AM_CFLAGS = $(X11_INCLUDES) @@ -61,8 +59,6 @@ lib@GL_LIB@_la_LIBADD = \ $(top_builddir)/src/gallium/state_trackers/glx/xlib/libxlib.la \ $(top_builddir)/src/gallium/winsys/sw/xlib/libws_xlib.la \ $(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/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 b94ef350b1..fb7a0ce50e 100644 --- a/src/gallium/targets/libgl-xlib/SConscript +++ b/src/gallium/targets/libgl-xlib/SConscript @@ -42,8 +42,8 @@ sources = [ ] if True: - env.Append(CPPDEFINES = ['GALLIUM_TRACE', 'GALLIUM_RBUG', 'GALLIUM_SOFTPIPE']) - env.Prepend(LIBS = [trace, rbug, softpipe]) + env.Append(CPPDEFINES = ['GALLIUM_SOFTPIPE']) + env.Prepend(LIBS = [softpipe]) if env['llvm']: env.Append(CPPDEFINES = ['GALLIUM_LLVMPIPE']) diff --git a/src/gallium/targets/libgl-xlib/meson.build b/src/gallium/targets/libgl-xlib/meson.build index 6884c82620..3d197ba719 100644 --- a/src/gallium/targets/libgl-xlib/meson.build +++ b/src/gallium/targets/libgl-xlib/meson.build @@ -24,8 +24,6 @@ gallium_xlib_c_args = [ '-DGALLIUM_SOFTPIPE', - '-DGALLIUM_RBUG', - '-DGALLIUME_TRACE', ] gallium_xlib_ld_args = [] gallium_xlib_link_with = [] @@ -50,7 +48,7 @@ libgl = shared_library( link_args : [ld_args_bsymbolic, ld_args_gc_sections, gallium_xlib_ld_args], link_depends : gallium_xlib_link_depends, link_with : [ - libxlib, libws_xlib, libtrace, librbug, libglapi_static, + libxlib, libws_xlib, libglapi_static, libgallium, libmesa_util, libmesa_gallium, gallium_xlib_link_with, ], dependencies : [dep_thread, dep_clock, dep_unwind, driver_swrast, driver_swr], diff --git a/src/gallium/targets/osmesa/Makefile.am b/src/gallium/targets/osmesa/Makefile.am index f8bee5ef67..dc4d49e107 100644 --- a/src/gallium/targets/osmesa/Makefile.am +++ b/src/gallium/targets/osmesa/Makefile.am @@ -33,8 +33,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/gallium/drivers \ -I$(top_srcdir)/src/gallium/winsys \ -I$(top_srcdir)/src/gallium/auxiliary \ - -DGALLIUM_SOFTPIPE \ - -DGALLIUM_TRACE + -DGALLIUM_SOFTPIPE lib_LTLIBRARIES = lib@OSMESA_LIB@.la @@ -60,7 +59,6 @@ lib@OSMESA_LIB@_la_LIBADD = \ $(top_builddir)/src/mesa/libmesagallium.la \ $(top_builddir)/src/gallium/auxiliary/libgallium.la \ $(top_builddir)/src/gallium/winsys/sw/null/libws_null.la \ - $(top_builddir)/src/gallium/drivers/trace/libtrace.la \ $(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la \ $(top_builddir)/src/gallium/state_trackers/osmesa/libosmesa.la \ $(top_builddir)/src/mapi/glapi/libglapi.la \ diff --git a/src/gallium/targets/osmesa/SConscript b/src/gallium/targets/osmesa/SConscript index ccf7d5170c..f49f1fe538 100644 --- a/src/gallium/targets/osmesa/SConscript +++ b/src/gallium/targets/osmesa/SConscript @@ -15,7 +15,6 @@ env.Prepend(LIBS = [ compiler, mesa, gallium, - trace, glsl, nir, spirv, @@ -23,7 +22,7 @@ env.Prepend(LIBS = [ softpipe ]) -env.Append(CPPDEFINES = ['GALLIUM_TRACE', 'GALLIUM_SOFTPIPE']) +env.Append(CPPDEFINES = ['GALLIUM_SOFTPIPE']) sources = ['target.c'] diff --git a/src/gallium/targets/osmesa/meson.build b/src/gallium/targets/osmesa/meson.build index e51c54f8bc..b4ae8f4b6e 100644 --- a/src/gallium/targets/osmesa/meson.build +++ b/src/gallium/targets/osmesa/meson.build @@ -35,7 +35,7 @@ endif libosmesa = shared_library( osmesa_lib_name, 'target.c', - c_args : [c_vis_args, '-DGALLIUM_TRACE'], + c_args : [c_vis_args], cpp_args : cpp_vis_args, link_args : [ld_args_gc_sections, osmesa_link_args], include_directories : [ @@ -45,8 +45,7 @@ libosmesa = shared_library( link_depends : osmesa_link_deps, link_whole : [libosmesa_st], link_with : [ - libmesa_gallium, libgallium, libglapi_static, libws_null, libtrace, - osmesa_link_with, + libmesa_gallium, libgallium, libglapi_static, libws_null, osmesa_link_with, ], dependencies : [ dep_selinux, dep_thread, dep_clock, dep_unwind, diff --git a/src/gallium/targets/pipe-loader/Makefile.am b/src/gallium/targets/pipe-loader/Makefile.am index bddc4e8b58..fa16e8535f 100644 --- a/src/gallium/targets/pipe-loader/Makefile.am +++ b/src/gallium/targets/pipe-loader/Makefile.am @@ -31,9 +31,7 @@ AM_CPPFLAGS = \ -I$(top_builddir)/src/util \ $(GALLIUM_PIPE_LOADER_DEFINES) \ $(LIBDRM_CFLAGS) \ - $(VISIBILITY_CFLAGS) \ - -DGALLIUM_RBUG \ - -DGALLIUM_TRACE + $(VISIBILITY_CFLAGS) pipedir = $(libdir)/gallium-pipe pipe_LTLIBRARIES = @@ -57,8 +55,6 @@ PIPE_LIBS += \ $(top_builddir)/src/gallium/auxiliary/libgallium.la \ $(top_builddir)/src/compiler/nir/libnir.la \ $(top_builddir)/src/util/libmesautil.la \ - $(top_builddir)/src/gallium/drivers/rbug/librbug.la \ - $(top_builddir)/src/gallium/drivers/trace/libtrace.la \ $(GALLIUM_COMMON_LIB_DEPS) AM_LDFLAGS = \ diff --git a/src/gallium/targets/pipe-loader/meson.build b/src/gallium/targets/pipe-loader/meson.build index 7466d98f2d..5a44102a69 100644 --- a/src/gallium/targets/pipe-loader/meson.build +++ b/src/gallium/targets/pipe-loader/meson.build @@ -20,8 +20,8 @@ pipe_loader_link_args = [ld_args_gc_sections] pipe_loader_link_deps = [] -pipe_loader_link_with = [libgallium, libnir, libmesa_util, librbug, libtrace] -pipe_loader_comp_args = ['-DGALLIUM_RBUG', '-DGALLIUM_TRACE'] +pipe_loader_link_with = [libgallium, libnir, libmesa_util] +pipe_loader_comp_args = [] pipe_loader_incs = [ inc_include, inc_src, inc_util, inc_gallium, inc_gallium_drivers, inc_gallium_winsys, inc_gallium_aux, diff --git a/src/gallium/tests/unit/Makefile.am b/src/gallium/tests/unit/Makefile.am index c9bede75be..9f1d3b98cd 100644 --- a/src/gallium/tests/unit/Makefile.am +++ b/src/gallium/tests/unit/Makefile.am @@ -14,7 +14,6 @@ AM_CPPFLAGS = \ LDADD = \ $(top_builddir)/src/gallium/auxiliary/libgallium.la \ $(top_builddir)/src/util/libmesautil.la \ - $(top_builddir)/src/gallium/drivers/trace/libtrace.la \ $(top_builddir)/src/gallium/winsys/sw/null/libws_null.la \ $(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la \ $(GALLIUM_COMMON_LIB_DEPS) |