[Mesa-dev] [PATCH] gallium: build ddebug, noop, rbug, trace as part of auxiliary
Nicolai Hähnle
nhaehnle at gmail.com
Wed Sep 6 08:20:49 UTC 2017
On 04.09.2017 22:36, Marek Olšák wrote:
> From: Marek Olšák <marek.olsak at amd.com>
>
> Building gallium is faster by 7.5 seconds on a 4core/8thread 3GHz CPU.
> (gallium build time is reduced by 15% when building only radeonsi)
>
> Non-recursive makefiles are great!
They are!
Maybe there was a problem applying the patch from email, but I'm getting
a whole bunch of build errors:
https://travis-ci.org/nhaehnle/mesa-1/builds/272377365
The cause is not immediately obvious to me though.
> ---
> src/gallium/Makefile.am | 12 ++++----
> src/gallium/auxiliary/Makefile.am | 10 ++++++-
> .../auxiliary/target-helpers/inline_debug_helper.h | 26 -----------------
> src/gallium/drivers/ddebug/Makefile.am | 9 ------
> src/gallium/drivers/ddebug/Makefile.sources | 14 ++++-----
> src/gallium/drivers/noop/Makefile.am | 16 -----------
> src/gallium/drivers/noop/Makefile.sources | 8 +++---
> src/gallium/drivers/rbug/Makefile.am | 33 ----------------------
> src/gallium/drivers/rbug/Makefile.sources | 18 ++++++------
> src/gallium/drivers/trace/Makefile.am | 14 ---------
> src/gallium/drivers/trace/Makefile.sources | 26 ++++++++---------
> src/gallium/state_trackers/osmesa/Makefile.am | 3 +-
> src/gallium/targets/d3dadapter9/Makefile.am | 8 +-----
> src/gallium/targets/dri/Makefile.am | 10 +------
> src/gallium/targets/libgl-xlib/Makefile.am | 6 +---
> src/gallium/targets/osmesa/Makefile.am | 4 +--
> src/gallium/targets/pipe-loader/Makefile.am | 6 +---
> src/gallium/tests/unit/Makefile.am | 1 -
> 18 files changed, 54 insertions(+), 170 deletions(-)
> delete mode 100644 src/gallium/drivers/ddebug/Makefile.am
> delete mode 100644 src/gallium/drivers/noop/Makefile.am
> delete mode 100644 src/gallium/drivers/rbug/Makefile.am
> delete mode 100644 src/gallium/drivers/trace/Makefile.am
>
> diff --git a/src/gallium/Makefile.am b/src/gallium/Makefile.am
> index 9f98a7e..9e8b827 100644
> --- a/src/gallium/Makefile.am
> +++ b/src/gallium/Makefile.am
> @@ -4,26 +4,20 @@ SUBDIRS =
> ## Gallium auxiliary module
> ##
>
> SUBDIRS += auxiliary
> 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
> endif
>
> ## i915g/i915
> if HAVE_GALLIUM_I915
> SUBDIRS += drivers/i915 winsys/i915/drm
> endif
>
> @@ -176,20 +170,26 @@ endif
> if HAVE_ST_NINE
> SUBDIRS += state_trackers/nine targets/d3dadapter9
> endif
>
> ##
> ## Don't forget to bundle the remaining (non autotools) state-trackers/targets
> ##
>
> EXTRA_DIST += \
> include \
> + drivers/noop/SConscript \
> + drivers/rbug/README \
> + drivers/rbug/SConscript \
> + drivers/trace/trace.xsl \
> + drivers/trace/README \
> + drivers/trace/SConscript \
> state_trackers/README \
> state_trackers/wgl targets/libgl-gdi \
> targets/graw-gdi targets/graw-null targets/graw-xlib \
> state_trackers/hgl targets/haiku-softpipe \
> tools
>
>
> ##
> ## Gallium tests
> ##
> diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am
> index a64ead2..5a92c1a 100644
> --- a/src/gallium/auxiliary/Makefile.am
> +++ b/src/gallium/auxiliary/Makefile.am
> @@ -1,32 +1,40 @@
> include Makefile.sources
> +include $(top_srcdir)/src/gallium/drivers/ddebug/Makefile.sources
> +include $(top_srcdir)/src/gallium/drivers/noop/Makefile.sources
> +include $(top_srcdir)/src/gallium/drivers/rbug/Makefile.sources
> +include $(top_srcdir)/src/gallium/drivers/trace/Makefile.sources
> include $(top_srcdir)/src/gallium/Automake.inc
>
> noinst_LTLIBRARIES = libgallium.la
>
> AM_CFLAGS = \
> -I$(top_srcdir)/src/loader \
> -I$(top_builddir)/src/compiler/nir \
> -I$(top_srcdir)/src/gallium/auxiliary/util \
> $(GALLIUM_CFLAGS) \
> $(LIBUNWIND_CFLAGS) \
> $(VISIBILITY_CFLAGS) \
> $(MSVC2013_COMPAT_CFLAGS)
>
> AM_CXXFLAGS = \
> $(VISIBILITY_CXXFLAGS) \
> $(MSVC2013_COMPAT_CXXFLAGS)
>
> libgallium_la_SOURCES = \
> $(C_SOURCES) \
> $(NIR_SOURCES) \
> - $(GENERATED_SOURCES)
> + $(GENERATED_SOURCES) \
> + $(DDEBUG_SOURCES) \
> + $(NOOP_SOURCES) \
> + $(RBUG_SOURCES) \
> + $(TRACE_SOURCES)
>
> if HAVE_LIBDRM
>
> AM_CFLAGS += \
> $(LIBDRM_CFLAGS)
>
> libgallium_la_SOURCES += \
> $(RENDERONLY_SOURCES)
>
> endif
> diff --git a/src/gallium/auxiliary/target-helpers/inline_debug_helper.h b/src/gallium/auxiliary/target-helpers/inline_debug_helper.h
> index 2443bf2..8556376 100644
> --- a/src/gallium/auxiliary/target-helpers/inline_debug_helper.h
> +++ b/src/gallium/auxiliary/target-helpers/inline_debug_helper.h
> @@ -4,56 +4,30 @@
>
> #include "pipe/p_compiler.h"
> #include "util/u_debug.h"
> #include "util/u_tests.h"
>
>
> /* Helper function to wrap a screen with
> * one or more debug driver: rbug, trace.
> */
>
> -#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
>
> -/*
> - * TODO: Audit the following *screen_create() - all of
> - * them should return the original screen on failuire.
> - */
> 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);
>
> return screen;
> }
>
> #endif
> diff --git a/src/gallium/drivers/ddebug/Makefile.am b/src/gallium/drivers/ddebug/Makefile.am
> deleted file mode 100644
> index f0e1662..0000000
> --- a/src/gallium/drivers/ddebug/Makefile.am
> +++ /dev/null
> @@ -1,9 +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)
> diff --git a/src/gallium/drivers/ddebug/Makefile.sources b/src/gallium/drivers/ddebug/Makefile.sources
> index 1bd3827..d43a75b 100644
> --- a/src/gallium/drivers/ddebug/Makefile.sources
> +++ b/src/gallium/drivers/ddebug/Makefile.sources
> @@ -1,7 +1,7 @@
> -C_SOURCES := \
> - dd_context.c \
> - dd_draw.c \
> - dd_pipe.h \
> - dd_public.h \
> - dd_screen.c \
> - dd_util.h
> +DDEBUG_SOURCES := \
> + $(top_srcdir)/src/gallium/drivers/ddebug/dd_context.c \
> + $(top_srcdir)/src/gallium/drivers/ddebug/dd_draw.c \
> + $(top_srcdir)/src/gallium/drivers/ddebug/dd_pipe.h \
> + $(top_srcdir)/src/gallium/drivers/ddebug/dd_public.h \
> + $(top_srcdir)/src/gallium/drivers/ddebug/dd_screen.c \
> + $(top_srcdir)/src/gallium/drivers/ddebug/dd_util.h
> diff --git a/src/gallium/drivers/noop/Makefile.am b/src/gallium/drivers/noop/Makefile.am
> deleted file mode 100644
> index dc1494b..0000000
> --- 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
> diff --git a/src/gallium/drivers/noop/Makefile.sources b/src/gallium/drivers/noop/Makefile.sources
> index 6d42286..fea96e3 100644
> --- a/src/gallium/drivers/noop/Makefile.sources
> +++ b/src/gallium/drivers/noop/Makefile.sources
> @@ -1,4 +1,4 @@
> -C_SOURCES := \
> - noop_pipe.c \
> - noop_public.h \
> - noop_state.c
> +NOOP_SOURCES := \
> + $(top_srcdir)/src/gallium/drivers/noop/noop_pipe.c \
> + $(top_srcdir)/src/gallium/drivers/noop/noop_public.h \
> + $(top_srcdir)/src/gallium/drivers/noop/noop_state.c
> diff --git a/src/gallium/drivers/rbug/Makefile.am b/src/gallium/drivers/rbug/Makefile.am
> deleted file mode 100644
> index 3e3cb86..0000000
> --- 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
> diff --git a/src/gallium/drivers/rbug/Makefile.sources b/src/gallium/drivers/rbug/Makefile.sources
> index f9f1d5c..b21e51e 100644
> --- a/src/gallium/drivers/rbug/Makefile.sources
> +++ b/src/gallium/drivers/rbug/Makefile.sources
> @@ -1,9 +1,9 @@
> -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
> +RBUG_SOURCES := \
> + $(top_srcdir)/src/gallium/drivers/rbug/rbug_context.c \
> + $(top_srcdir)/src/gallium/drivers/rbug/rbug_context.h \
> + $(top_srcdir)/src/gallium/drivers/rbug/rbug_core.c \
> + $(top_srcdir)/src/gallium/drivers/rbug/rbug_objects.c \
> + $(top_srcdir)/src/gallium/drivers/rbug/rbug_objects.h \
> + $(top_srcdir)/src/gallium/drivers/rbug/rbug_public.h \
> + $(top_srcdir)/src/gallium/drivers/rbug/rbug_screen.c \
> + $(top_srcdir)/src/gallium/drivers/rbug/rbug_screen.h
> diff --git a/src/gallium/drivers/trace/Makefile.am b/src/gallium/drivers/trace/Makefile.am
> deleted file mode 100644
> index 5640192..0000000
> --- a/src/gallium/drivers/trace/Makefile.am
> +++ /dev/null
> @@ -1,14 +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
> diff --git a/src/gallium/drivers/trace/Makefile.sources b/src/gallium/drivers/trace/Makefile.sources
> index 4c019a3..f3451d4 100644
> --- a/src/gallium/drivers/trace/Makefile.sources
> +++ b/src/gallium/drivers/trace/Makefile.sources
> @@ -1,13 +1,13 @@
> -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
> +TRACE_SOURCES := \
> + $(top_srcdir)/src/gallium/drivers/trace/tr_context.c \
> + $(top_srcdir)/src/gallium/drivers/trace/tr_context.h \
> + $(top_srcdir)/src/gallium/drivers/trace/tr_dump.c \
> + $(top_srcdir)/src/gallium/drivers/trace/tr_dump_defines.h \
> + $(top_srcdir)/src/gallium/drivers/trace/tr_dump.h \
> + $(top_srcdir)/src/gallium/drivers/trace/tr_dump_state.c \
> + $(top_srcdir)/src/gallium/drivers/trace/tr_dump_state.h \
> + $(top_srcdir)/src/gallium/drivers/trace/tr_public.h \
> + $(top_srcdir)/src/gallium/drivers/trace/tr_screen.c \
> + $(top_srcdir)/src/gallium/drivers/trace/tr_screen.h \
> + $(top_srcdir)/src/gallium/drivers/trace/tr_texture.c \
> + $(top_srcdir)/src/gallium/drivers/trace/tr_texture.h
> diff --git a/src/gallium/state_trackers/osmesa/Makefile.am b/src/gallium/state_trackers/osmesa/Makefile.am
> index 22e65c8..f8a172d 100644
> --- a/src/gallium/state_trackers/osmesa/Makefile.am
> +++ b/src/gallium/state_trackers/osmesa/Makefile.am
> @@ -26,18 +26,17 @@ AM_CFLAGS = $(GALLIUM_CFLAGS)
>
> AM_CPPFLAGS = \
> -I$(top_srcdir)/include \
> -I$(top_srcdir)/src/mapi \
> -I$(top_srcdir)/src/mesa \
> -I$(top_srcdir)/src/gallium/include \
> -I$(top_srcdir)/src/gallium/drivers \
> -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
>
> libosmesa_la_SOURCES = $(C_SOURCES)
>
> EXTRA_DIST = SConscript
> diff --git a/src/gallium/targets/d3dadapter9/Makefile.am b/src/gallium/targets/d3dadapter9/Makefile.am
> index 9357d30..700bef0 100644
> --- a/src/gallium/targets/d3dadapter9/Makefile.am
> +++ b/src/gallium/targets/d3dadapter9/Makefile.am
> @@ -28,24 +28,21 @@ AM_CFLAGS = \
> -I$(top_srcdir)/src/mapi/ \
> -I$(top_srcdir)/src/mesa/ \
> -I$(top_builddir)/src/util \
> -I$(top_srcdir)/src/mesa/drivers/dri/common/ \
> -I$(top_srcdir)/src/gallium/winsys \
> -I$(top_srcdir)/src/gallium/state_trackers/nine \
> $(GALLIUM_TARGET_CFLAGS) \
> $(VISIBILITY_CFLAGS)
>
> AM_CPPFLAGS = \
> - $(DEFINES) \
> - -DGALLIUM_DDEBUG \
> - -DGALLIUM_RBUG \
> - -DGALLIUM_TRACE
> + $(DEFINES)
>
> ninedir = $(D3D_DRIVER_INSTALL_DIR)
> nine_LTLIBRARIES = d3dadapter9.la
>
> pkgconfigdir = $(libdir)/pkgconfig
> pkgconfig_DATA = d3d.pc
>
> d3dadapter9_la_SOURCES = \
> description.c \
> getproc.c \
> @@ -63,23 +60,20 @@ d3dadapter9_la_LDFLAGS = \
> if HAVE_LD_VERSION_SCRIPT
> d3dadapter9_la_LDFLAGS += \
> -Wl,--version-script=$(top_srcdir)/src/gallium/targets/d3dadapter9/d3dadapter9.sym
> endif # HAVE_LD_VERSION_SCRIPT
>
> d3dadapter9_la_LIBADD = \
> $(top_builddir)/src/gallium/auxiliary/libgalliumvl_stub.la \
> $(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)
>
> EXTRA_d3dadapter9_la_DEPENDENCIES = d3dadapter9.sym
> EXTRA_DIST = d3dadapter9.sym
>
> TARGET_DRIVERS =
> TARGET_CPPFLAGS =
> TARGET_LIB_DEPS =
>
> diff --git a/src/gallium/targets/dri/Makefile.am b/src/gallium/targets/dri/Makefile.am
> index 2d2e1ae..3393e64 100644
> --- a/src/gallium/targets/dri/Makefile.am
> +++ b/src/gallium/targets/dri/Makefile.am
> @@ -2,25 +2,21 @@ include $(top_srcdir)/src/gallium/Automake.inc
>
> AM_CFLAGS = \
> -I$(top_srcdir)/src/mapi \
> -I$(top_srcdir)/src/mesa \
> -I$(top_srcdir)/src \
> -I$(top_srcdir)/src/mesa/drivers/dri/common \
> -I$(top_srcdir)/src/gallium/state_trackers/dri \
> $(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
>
> nodist_EXTRA_gallium_dri_la_SOURCES = dummy.cpp
> gallium_dri_la_SOURCES =
>
> gallium_dri_la_LDFLAGS = \
> -shared \
> -shrext .so \
> @@ -40,24 +36,20 @@ gallium_dri_la_LDFLAGS += \
> -Wl,--dynamic-list=$(top_srcdir)/src/gallium/targets/dri-vdpau.dyn
> endif # HAVE_LD_DYNAMIC_LIST
>
> gallium_dri_la_LIBADD = \
> $(top_builddir)/src/mesa/libmesagallium.la \
> $(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \
> $(top_builddir)/src/mesa/drivers/dri/common/libmegadriver_stub.la \
> $(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 \
> $(SELINUX_LIBS) \
> $(EXPAT_LIBS) \
> $(LIBDRM_LIBS) \
> $(GALLIUM_COMMON_LIB_DEPS)
>
> EXTRA_gallium_dri_la_DEPENDENCIES = \
> dri.sym \
> $(top_srcdir)/src/gallium/targets/dri-vdpau.dyn
> EXTRA_DIST = \
> diff --git a/src/gallium/targets/libgl-xlib/Makefile.am b/src/gallium/targets/libgl-xlib/Makefile.am
> index a29199f..9c6ddd0 100644
> --- a/src/gallium/targets/libgl-xlib/Makefile.am
> +++ b/src/gallium/targets/libgl-xlib/Makefile.am
> @@ -32,23 +32,21 @@ AM_CPPFLAGS = \
> -I$(top_srcdir)/include \
> -I$(top_srcdir)/src \
> -I$(top_srcdir)/src/mapi \
> -I$(top_srcdir)/src/mesa \
> -I$(top_srcdir)/src/mesa/main \
> -I$(top_srcdir)/src/gallium/include \
> -I$(top_srcdir)/src/gallium/drivers \
> -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)
>
> lib_LTLIBRARIES = lib at GL_LIB@.la
>
> nodist_EXTRA_lib at GL_LIB@_la_SOURCES = dummy.cpp
> lib at GL_LIB@_la_SOURCES = xlib.c
> lib at GL_LIB@_la_LDFLAGS = \
> -no-undefined \
> -version-number $(GL_MAJOR):$(GL_MINOR):$(GL_TINY) \
> @@ -58,22 +56,20 @@ lib at GL_LIB@_la_LDFLAGS = \
>
> if HAVE_LD_VERSION_SCRIPT
> lib at GL_LIB@_la_LDFLAGS += \
> -Wl,--version-script=$(top_srcdir)/src/gallium/targets/libgl-xlib/libgl-xlib.sym
> endif
>
> lib at 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 \
> $(SHARED_GLAPI_LIB) \
> $(GL_LIB_DEPS) \
> $(CLOCK_LIB) \
> $(LIBUNWIND_LIBS)
>
> if HAVE_GALLIUM_LLVM
> lib at GL_LIB@_la_LIBADD += $(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la $(LLVM_LIBS)
> diff --git a/src/gallium/targets/osmesa/Makefile.am b/src/gallium/targets/osmesa/Makefile.am
> index 2b4af57..58ed02f 100644
> --- a/src/gallium/targets/osmesa/Makefile.am
> +++ b/src/gallium/targets/osmesa/Makefile.am
> @@ -26,22 +26,21 @@ AM_CFLAGS = \
> $(VISIBILITY_CFLAGS)
>
> AM_CPPFLAGS = \
> -I$(top_srcdir)/include \
> -I$(top_srcdir)/src/mapi \
> -I$(top_srcdir)/src/mesa \
> -I$(top_srcdir)/src/gallium/include \
> -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 at OSMESA_LIB@.la
>
> nodist_EXTRA_lib at OSMESA_LIB@_la_SOURCES = dummy.cpp
> lib at OSMESA_LIB@_la_SOURCES = target.c
>
> lib at OSMESA_LIB@_la_LDFLAGS = \
> -no-undefined \
> -version-number @OSMESA_VERSION@ \
> $(GC_SECTIONS) \
> @@ -53,21 +52,20 @@ lib at OSMESA_LIB@_la_LDFLAGS += \
> endif
>
> if HAVE_SHARED_GLAPI
> SHARED_GLAPI_LIB = $(top_builddir)/src/mapi/shared-glapi/libglapi.la
> endif
>
> lib at 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 \
> $(SHARED_GLAPI_LIB) \
> $(OSMESA_LIB_DEPS) \
> $(CLOCK_LIB) \
> $(LIBUNWIND_LIBS)
>
> if HAVE_GALLIUM_LLVM
> AM_CPPFLAGS += -DGALLIUM_LLVMPIPE
> diff --git a/src/gallium/targets/pipe-loader/Makefile.am b/src/gallium/targets/pipe-loader/Makefile.am
> index 050dd7d..8502de5 100644
> --- a/src/gallium/targets/pipe-loader/Makefile.am
> +++ b/src/gallium/targets/pipe-loader/Makefile.am
> @@ -24,23 +24,21 @@ include $(top_srcdir)/src/gallium/Automake.inc
>
> AM_CPPFLAGS = \
> $(GALLIUM_CFLAGS) \
> -I$(top_srcdir)/include \
> -I$(top_builddir)/src/gallium/drivers \
> -I$(top_srcdir)/src/gallium/drivers \
> -I$(top_srcdir)/src/gallium/winsys \
> -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 =
>
> PIPE_LIBS =
>
> if NEED_GALLIUM_VL
> PIPE_LIBS += \
> $(top_builddir)/src/gallium/auxiliary/libgalliumvl.la
> else
> @@ -50,22 +48,20 @@ endif
>
> if NEED_GALLIUM_VL_WINSYS
> PIPE_LIBS+= \
> $(top_builddir)/src/gallium/auxiliary/libgalliumvlwinsys.la
> endif
>
> 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 = \
> -module \
> -no-undefined \
> -avoid-version \
> $(GC_SECTIONS) \
> $(LD_NO_UNDEFINED)
>
> if HAVE_LD_VERSION_SCRIPT
> diff --git a/src/gallium/tests/unit/Makefile.am b/src/gallium/tests/unit/Makefile.am
> index c9bede7..9f1d3b9 100644
> --- a/src/gallium/tests/unit/Makefile.am
> +++ b/src/gallium/tests/unit/Makefile.am
> @@ -7,21 +7,20 @@ EXTRA_DIST = SConscript
> AM_CFLAGS = \
> $(GALLIUM_CFLAGS)
>
> AM_CPPFLAGS = \
> -I$(top_srcdir)/src/gallium/drivers \
> -I$(top_srcdir)/src/gallium/winsys
>
> 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)
>
> noinst_PROGRAMS = pipe_barrier_test u_cache_test u_half_test \
> u_format_test u_format_compatible_test translate_test
>
> pipe_barrier_test_SOURCES = pipe_barrier_test.c
>
> u_cache_test_SOURCES = u_cache_test.c
>
--
Lerne, wie die Welt wirklich ist,
Aber vergiss niemals, wie sie sein sollte.
More information about the mesa-dev
mailing list