gallium: move ddebug, noop, rbug, trace to auxiliary to improve build times
which also simplifies the build scripts.
This commit is contained in:
Marek Olšák
@@ -3011,21 +3011,17 @@ AC_CONFIG_FILES([Makefile
|
||||
src/gallium/auxiliary/Makefile
|
||||
src/gallium/auxiliary/pipe-loader/Makefile
|
||||
src/gallium/drivers/freedreno/Makefile
|
||||
src/gallium/drivers/ddebug/Makefile
|
||||
src/gallium/drivers/i915/Makefile
|
||||
src/gallium/drivers/llvmpipe/Makefile
|
||||
src/gallium/drivers/noop/Makefile
|
||||
src/gallium/drivers/nouveau/Makefile
|
||||
src/gallium/drivers/pl111/Makefile
|
||||
src/gallium/drivers/r300/Makefile
|
||||
src/gallium/drivers/r600/Makefile
|
||||
src/gallium/drivers/radeonsi/Makefile
|
||||
src/gallium/drivers/rbug/Makefile
|
||||
src/gallium/drivers/softpipe/Makefile
|
||||
src/gallium/drivers/svga/Makefile
|
||||
src/gallium/drivers/swr/Makefile
|
||||
src/gallium/drivers/tegra/Makefile
|
||||
src/gallium/drivers/trace/Makefile
|
||||
src/gallium/drivers/etnaviv/Makefile
|
||||
src/gallium/drivers/imx/Makefile
|
||||
src/gallium/drivers/vc4/Makefile
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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',
|
||||
])
|
||||
|
||||
|
||||
@@ -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 \
|
||||
|
||||
@@ -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 \
|
||||
|
||||
@@ -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 =
|
||||
@@ -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',
|
||||
|
||||
@@ -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:
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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
|
||||
@@ -1,7 +0,0 @@
|
||||
C_SOURCES := \
|
||||
dd_context.c \
|
||||
dd_draw.c \
|
||||
dd_pipe.h \
|
||||
dd_public.h \
|
||||
dd_screen.c \
|
||||
dd_util.h
|
||||
@@ -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,
|
||||
)
|
||||
@@ -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
|
||||
@@ -1,4 +0,0 @@
|
||||
C_SOURCES := \
|
||||
noop_pipe.c \
|
||||
noop_public.h \
|
||||
noop_state.c
|
||||
@@ -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')
|
||||
@@ -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,
|
||||
)
|
||||
@@ -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"
|
||||
|
||||
@@ -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: */
|
||||
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -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')
|
||||
@@ -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,
|
||||
)
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -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')
|
||||
@@ -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,
|
||||
)
|
||||
@@ -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')
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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,
|
||||
],
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
@@ -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 : [
|
||||
|
||||
@@ -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) \
|
||||
|
||||
@@ -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])
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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')
|
||||
|
||||
@@ -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')
|
||||
|
||||
@@ -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])
|
||||
|
||||
|
||||
@@ -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 : [
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 \
|
||||
|
||||
@@ -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'])
|
||||
|
||||
@@ -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],
|
||||
|
||||
@@ -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 \
|
||||
|
||||
@@ -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']
|
||||
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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 = \
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user