From: Marek Olšák <marek.ol...@amd.com>
which also simplifies the build scripts.
---
configure.ac | 4 ---
src/gallium/Makefile.am | 6 ----
src/gallium/SConscript | 2 --
src/gallium/auxiliary/Makefile.am | 3 ++
src/gallium/auxiliary/Makefile.sources | 29 +++++++++++++++++++
.../driver_ddebug}/dd_context.c | 0
.../ddebug => auxiliary/driver_ddebug}/dd_draw.c | 0
.../ddebug => auxiliary/driver_ddebug}/dd_pipe.h | 0
.../ddebug => auxiliary/driver_ddebug}/dd_public.h | 0
.../ddebug => auxiliary/driver_ddebug}/dd_screen.c | 0
.../ddebug => auxiliary/driver_ddebug}/dd_util.h | 0
.../noop => auxiliary/driver_noop}/noop_pipe.c | 0
.../noop => auxiliary/driver_noop}/noop_public.h | 0
.../noop => auxiliary/driver_noop}/noop_state.c | 0
.../{drivers/rbug => auxiliary/driver_rbug}/README | 0
.../rbug => auxiliary/driver_rbug}/rbug_context.c | 0
.../rbug => auxiliary/driver_rbug}/rbug_context.h | 0
.../rbug => auxiliary/driver_rbug}/rbug_core.c | 0
.../rbug => auxiliary/driver_rbug}/rbug_objects.c | 0
.../rbug => auxiliary/driver_rbug}/rbug_objects.h | 0
.../rbug => auxiliary/driver_rbug}/rbug_public.h | 0
.../rbug => auxiliary/driver_rbug}/rbug_screen.c | 0
.../rbug => auxiliary/driver_rbug}/rbug_screen.h | 0
.../trace => auxiliary/driver_trace}/README | 2 +-
.../trace => auxiliary/driver_trace}/tr_context.c | 0
.../trace => auxiliary/driver_trace}/tr_context.h | 0
.../trace => auxiliary/driver_trace}/tr_dump.c | 0
.../trace => auxiliary/driver_trace}/tr_dump.h | 0
.../driver_trace}/tr_dump_defines.h | 0
.../driver_trace}/tr_dump_state.c | 0
.../driver_trace}/tr_dump_state.h | 0
.../trace => auxiliary/driver_trace}/tr_public.h | 0
.../trace => auxiliary/driver_trace}/tr_screen.c | 0
.../trace => auxiliary/driver_trace}/tr_screen.h | 0
.../trace => auxiliary/driver_trace}/tr_texture.c | 0
.../trace => auxiliary/driver_trace}/tr_texture.h | 0
.../trace => auxiliary/driver_trace}/trace.xsl | 0
src/gallium/auxiliary/meson.build | 29 +++++++++++++++++++
src/gallium/auxiliary/rbug/README | 2 +-
.../auxiliary/target-helpers/inline_debug_helper.h | 32 ++++-----------------
src/gallium/drivers/ddebug/Makefile.am | 11 --------
src/gallium/drivers/ddebug/Makefile.sources | 7 -----
src/gallium/drivers/ddebug/meson.build | 28 ------------------
src/gallium/drivers/noop/Makefile.am | 16 -----------
src/gallium/drivers/noop/Makefile.sources | 4 ---
src/gallium/drivers/noop/SConscript | 13 ---------
src/gallium/drivers/noop/meson.build | 27 ------------------
src/gallium/drivers/radeonsi/si_debug.c | 2 +-
src/gallium/drivers/radeonsi/si_pipe.c | 2 +-
src/gallium/drivers/rbug/Makefile.am | 33 ----------------------
src/gallium/drivers/rbug/Makefile.sources | 9 ------
src/gallium/drivers/rbug/SConscript | 12 --------
src/gallium/drivers/rbug/meson.build | 28 ------------------
src/gallium/drivers/trace/Makefile.am | 15 ----------
src/gallium/drivers/trace/Makefile.sources | 13 ---------
src/gallium/drivers/trace/SConscript | 14 ---------
src/gallium/drivers/trace/meson.build | 29 -------------------
src/gallium/meson.build | 4 ---
src/gallium/state_trackers/osmesa/Makefile.am | 3 +-
src/gallium/state_trackers/osmesa/meson.build | 2 +-
src/gallium/targets/d3dadapter9/Makefile.am | 8 +-----
src/gallium/targets/d3dadapter9/meson.build | 10 ++-----
src/gallium/targets/dri/Makefile.am | 10 +------
src/gallium/targets/dri/SConscript | 7 -----
src/gallium/targets/dri/meson.build | 11 ++------
src/gallium/targets/graw-gdi/SConscript | 4 +--
src/gallium/targets/graw-xlib/SConscript | 6 ++--
src/gallium/targets/haiku-softpipe/SConscript | 4 ---
src/gallium/targets/haiku-softpipe/meson.build | 2 +-
src/gallium/targets/libgl-gdi/SConscript | 2 --
src/gallium/targets/libgl-xlib/Makefile.am | 6 +---
src/gallium/targets/libgl-xlib/SConscript | 4 +--
src/gallium/targets/libgl-xlib/meson.build | 4 +--
src/gallium/targets/osmesa/Makefile.am | 4 +--
src/gallium/targets/osmesa/SConscript | 3 +-
src/gallium/targets/osmesa/meson.build | 5 ++--
src/gallium/targets/pipe-loader/Makefile.am | 6 +---
src/gallium/targets/pipe-loader/meson.build | 4 +--
src/gallium/tests/unit/Makefile.am | 1 -
79 files changed, 96 insertions(+), 386 deletions(-)
rename src/gallium/{drivers/ddebug => auxiliary/driver_ddebug}/dd_context.c
(100%)
rename src/gallium/{drivers/ddebug => auxiliary/driver_ddebug}/dd_draw.c (100%)
rename src/gallium/{drivers/ddebug => auxiliary/driver_ddebug}/dd_pipe.h (100%)
rename src/gallium/{drivers/ddebug => auxiliary/driver_ddebug}/dd_public.h
(100%)
rename src/gallium/{drivers/ddebug => auxiliary/driver_ddebug}/dd_screen.c
(100%)
rename src/gallium/{drivers/ddebug => auxiliary/driver_ddebug}/dd_util.h (100%)
rename src/gallium/{drivers/noop => auxiliary/driver_noop}/noop_pipe.c (100%)
rename src/gallium/{drivers/noop => auxiliary/driver_noop}/noop_public.h (100%)
rename src/gallium/{drivers/noop => auxiliary/driver_noop}/noop_state.c (100%)
rename src/gallium/{drivers/rbug => auxiliary/driver_rbug}/README (100%)
rename src/gallium/{drivers/rbug => auxiliary/driver_rbug}/rbug_context.c
(100%)
rename src/gallium/{drivers/rbug => auxiliary/driver_rbug}/rbug_context.h
(100%)
rename src/gallium/{drivers/rbug => auxiliary/driver_rbug}/rbug_core.c (100%)
rename src/gallium/{drivers/rbug => auxiliary/driver_rbug}/rbug_objects.c
(100%)
rename src/gallium/{drivers/rbug => auxiliary/driver_rbug}/rbug_objects.h
(100%)
rename src/gallium/{drivers/rbug => auxiliary/driver_rbug}/rbug_public.h (100%)
rename src/gallium/{drivers/rbug => auxiliary/driver_rbug}/rbug_screen.c (100%)
rename src/gallium/{drivers/rbug => auxiliary/driver_rbug}/rbug_screen.h (100%)
rename src/gallium/{drivers/trace => auxiliary/driver_trace}/README (96%)
rename src/gallium/{drivers/trace => auxiliary/driver_trace}/tr_context.c
(100%)
rename src/gallium/{drivers/trace => auxiliary/driver_trace}/tr_context.h
(100%)
rename src/gallium/{drivers/trace => auxiliary/driver_trace}/tr_dump.c (100%)
rename src/gallium/{drivers/trace => auxiliary/driver_trace}/tr_dump.h (100%)
rename src/gallium/{drivers/trace => auxiliary/driver_trace}/tr_dump_defines.h
(100%)
rename src/gallium/{drivers/trace => auxiliary/driver_trace}/tr_dump_state.c
(100%)
rename src/gallium/{drivers/trace => auxiliary/driver_trace}/tr_dump_state.h
(100%)
rename src/gallium/{drivers/trace => auxiliary/driver_trace}/tr_public.h (100%)
rename src/gallium/{drivers/trace => auxiliary/driver_trace}/tr_screen.c (100%)
rename src/gallium/{drivers/trace => auxiliary/driver_trace}/tr_screen.h (100%)
rename src/gallium/{drivers/trace => auxiliary/driver_trace}/tr_texture.c
(100%)
rename src/gallium/{drivers/trace => auxiliary/driver_trace}/tr_texture.h
(100%)
rename src/gallium/{drivers/trace => auxiliary/driver_trace}/trace.xsl (100%)
delete mode 100644 src/gallium/drivers/ddebug/Makefile.am
delete mode 100644 src/gallium/drivers/ddebug/Makefile.sources
delete mode 100644 src/gallium/drivers/ddebug/meson.build
delete mode 100644 src/gallium/drivers/noop/Makefile.am
delete mode 100644 src/gallium/drivers/noop/Makefile.sources
delete mode 100644 src/gallium/drivers/noop/SConscript
delete mode 100644 src/gallium/drivers/noop/meson.build
delete mode 100644 src/gallium/drivers/rbug/Makefile.am
delete mode 100644 src/gallium/drivers/rbug/Makefile.sources
delete mode 100644 src/gallium/drivers/rbug/SConscript
delete mode 100644 src/gallium/drivers/rbug/meson.build
delete mode 100644 src/gallium/drivers/trace/Makefile.am
delete mode 100644 src/gallium/drivers/trace/Makefile.sources
delete mode 100644 src/gallium/drivers/trace/SConscript
delete mode 100644 src/gallium/drivers/trace/meson.build
diff --git a/configure.ac b/configure.ac
index c0318c1..3b8a063 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3004,35 +3004,31 @@ AC_CONFIG_FILES([Makefile
src/compiler/Makefile
src/egl/Makefile
src/egl/main/egl.pc
src/egl/wayland/wayland-drm/Makefile
src/egl/wayland/wayland-egl/Makefile
src/egl/wayland/wayland-egl/wayland-egl.pc
src/gallium/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
src/gallium/drivers/vc5/Makefile
src/gallium/drivers/virgl/Makefile
src/gallium/state_trackers/clover/Makefile
src/gallium/state_trackers/dri/Makefile
src/gallium/state_trackers/glx/xlib/Makefile
src/gallium/state_trackers/nine/Makefile
src/gallium/state_trackers/omx/Makefile
diff --git a/src/gallium/Makefile.am b/src/gallium/Makefile.am
index f1fd22c..e2e8eae 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
diff --git a/src/gallium/SConscript b/src/gallium/SConscript
index 9273db7..358c31e 100644
--- a/src/gallium/SConscript
+++ b/src/gallium/SConscript
@@ -7,24 +7,22 @@ Import('env')
SConscript('auxiliary/SConscript')
SConscript('auxiliary/pipe-loader/SConscript')
#
# Drivers
#
# 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',
])
#
# Winsys
#
SConscript([
'winsys/sw/null/SConscript',
'winsys/sw/wrapper/SConscript',
diff --git a/src/gallium/auxiliary/Makefile.am
b/src/gallium/auxiliary/Makefile.am
index 95a325f..07856e5 100644
--- a/src/gallium/auxiliary/Makefile.am
+++ b/src/gallium/auxiliary/Makefile.am
@@ -101,20 +101,23 @@ endif
if HAVE_PLATFORM_DRM
libgalliumvlwinsys_la_SOURCES += $(VL_WINSYS_DRM_SOURCES)
endif
endif # NEED_GALLIUM_VL_WINSYS
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 \
indices/u_unfilled_gen.py \
postprocess/ADDING \
rbug/README \
target-helpers \
util/u_format.csv \
util/u_format_pack.py \
util/u_format_parse.py \
diff --git a/src/gallium/auxiliary/Makefile.sources
b/src/gallium/auxiliary/Makefile.sources
index a2dae04..d7d04ba 100644
--- a/src/gallium/auxiliary/Makefile.sources
+++ b/src/gallium/auxiliary/Makefile.sources
@@ -50,20 +50,49 @@ C_SOURCES := \
draw/draw_pt_vsplit_tmp.h \
draw/draw_so_emit_tmp.h \
draw/draw_split_tmp.h \
draw/draw_vbuf.h \
draw/draw_vertex.c \
draw/draw_vertex.h \
draw/draw_vs.c \
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 \
hud/hud_context.h \
hud/hud_cpu.c \
hud/hud_nic.c \
hud/hud_cpufreq.c \
hud/hud_diskstat.c \
hud/hud_sensors_temp.c \
hud/hud_driver_query.c \
diff --git a/src/gallium/drivers/ddebug/dd_context.c
b/src/gallium/auxiliary/driver_ddebug/dd_context.c
similarity index 100%
rename from src/gallium/drivers/ddebug/dd_context.c
rename to 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
similarity index 100%
rename from src/gallium/drivers/ddebug/dd_draw.c
rename to 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
similarity index 100%
rename from src/gallium/drivers/ddebug/dd_pipe.h
rename to 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
similarity index 100%
rename from src/gallium/drivers/ddebug/dd_public.h
rename to 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
similarity index 100%
rename from src/gallium/drivers/ddebug/dd_screen.c
rename to 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
similarity index 100%
rename from src/gallium/drivers/ddebug/dd_util.h
rename to 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
similarity index 100%
rename from src/gallium/drivers/noop/noop_pipe.c
rename to 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
similarity index 100%
rename from src/gallium/drivers/noop/noop_public.h
rename to 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
similarity index 100%
rename from src/gallium/drivers/noop/noop_state.c
rename to src/gallium/auxiliary/driver_noop/noop_state.c
diff --git a/src/gallium/drivers/rbug/README
b/src/gallium/auxiliary/driver_rbug/README
similarity index 100%
rename from src/gallium/drivers/rbug/README
rename to 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
similarity index 100%
rename from src/gallium/drivers/rbug/rbug_context.c
rename to 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
similarity index 100%
rename from src/gallium/drivers/rbug/rbug_context.h
rename to 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
similarity index 100%
rename from src/gallium/drivers/rbug/rbug_core.c
rename to 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
similarity index 100%
rename from src/gallium/drivers/rbug/rbug_objects.c
rename to 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
similarity index 100%
rename from src/gallium/drivers/rbug/rbug_objects.h
rename to 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
similarity index 100%
rename from src/gallium/drivers/rbug/rbug_public.h
rename to 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
similarity index 100%
rename from src/gallium/drivers/rbug/rbug_screen.c
rename to 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
similarity index 100%
rename from src/gallium/drivers/rbug/rbug_screen.h
rename to src/gallium/auxiliary/driver_rbug/rbug_screen.h
diff --git a/src/gallium/drivers/trace/README
b/src/gallium/auxiliary/driver_trace/README
similarity index 96%
rename from src/gallium/drivers/trace/README
rename to src/gallium/auxiliary/driver_trace/README
index cacd2e1..fbad26c 100644
--- a/src/gallium/drivers/trace/README
+++ b/src/gallium/auxiliary/driver_trace/README
@@ -21,21 +21,21 @@ Firefox or Internet Explorer.
For long traces you can use the
src/gallium/tools/trace/dump.py tri.trace | less -R
== Remote debugging ==
For remote debugging see:
- src/gallium/drivers/rbug/README
+ src/gallium/auxiliary/driver_rbug/README
= Integrating =
You can integrate the trace pipe driver either inside the state tracker or the
target. The procedure on both cases is the same. Let's assume you have a
pipe_screen obtained by the usual means (variable and function names are just
for illustration purposes):
real_screen = real_screen_create(...);
diff --git a/src/gallium/drivers/trace/tr_context.c
b/src/gallium/auxiliary/driver_trace/tr_context.c
similarity index 100%
rename from src/gallium/drivers/trace/tr_context.c
rename to 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
similarity index 100%
rename from src/gallium/drivers/trace/tr_context.h
rename to 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
similarity index 100%
rename from src/gallium/drivers/trace/tr_dump.c
rename to 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
similarity index 100%
rename from src/gallium/drivers/trace/tr_dump.h
rename to 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
similarity index 100%
rename from src/gallium/drivers/trace/tr_dump_defines.h
rename to 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
similarity index 100%
rename from src/gallium/drivers/trace/tr_dump_state.c
rename to 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
similarity index 100%
rename from src/gallium/drivers/trace/tr_dump_state.h
rename to 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
similarity index 100%
rename from src/gallium/drivers/trace/tr_public.h
rename to 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
similarity index 100%
rename from src/gallium/drivers/trace/tr_screen.c
rename to 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
similarity index 100%
rename from src/gallium/drivers/trace/tr_screen.h
rename to 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
similarity index 100%
rename from src/gallium/drivers/trace/tr_texture.c
rename to 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
similarity index 100%
rename from src/gallium/drivers/trace/tr_texture.h
rename to 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
similarity index 100%
rename from src/gallium/drivers/trace/trace.xsl
rename to src/gallium/auxiliary/driver_trace/trace.xsl
diff --git a/src/gallium/auxiliary/meson.build
b/src/gallium/auxiliary/meson.build
index 0108b0e..fefc6f7 100644
--- a/src/gallium/auxiliary/meson.build
+++ b/src/gallium/auxiliary/meson.build
@@ -70,20 +70,49 @@ files_libgallium = files(
'draw/draw_pt_vsplit_tmp.h',
'draw/draw_so_emit_tmp.h',
'draw/draw_split_tmp.h',
'draw/draw_vbuf.h',
'draw/draw_vertex.c',
'draw/draw_vertex.h',
'draw/draw_vs.c',
'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',
'hud/hud_context.h',
'hud/hud_cpu.c',
'hud/hud_nic.c',
'hud/hud_cpufreq.c',
'hud/hud_diskstat.c',
'hud/hud_sensors_temp.c',
'hud/hud_driver_query.c',
diff --git a/src/gallium/auxiliary/rbug/README
b/src/gallium/auxiliary/rbug/README
index c515643..0c41c8c 100644
--- a/src/gallium/auxiliary/rbug/README
+++ b/src/gallium/auxiliary/rbug/README
@@ -3,21 +3,21 @@
= About =
This directory contains the common code for the Gallium 3D remote debugging
driver and clients. The code is two parts the connection managment code and
the (de)marsheller.
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:
progs/rbug/README
for a GUI see:
http://cgit.freedesktop.org/mesa/rbug-gui
diff --git a/src/gallium/auxiliary/target-helpers/inline_debug_helper.h
b/src/gallium/auxiliary/target-helpers/inline_debug_helper.h
index 2443bf2..66d46de 100644
--- a/src/gallium/auxiliary/target-helpers/inline_debug_helper.h
+++ b/src/gallium/auxiliary/target-helpers/inline_debug_helper.h
@@ -1,59 +1,37 @@
#ifndef INLINE_DEBUG_HELPER_H
#define INLINE_DEBUG_HELPER_H
#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.
+ * 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
* 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 b36ea23..0000000
--- 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 1bd3827..0000000
--- 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 09ede3d..0000000
--- 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 1a4354e..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 meson.build
diff --git a/src/gallium/drivers/noop/Makefile.sources
b/src/gallium/drivers/noop/Makefile.sources
deleted file mode 100644
index 6d42286..0000000
--- 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 9cb2e29..0000000
--- 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 c4bb150..0000000
--- 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 00e0722..99fd0f4 100644
--- a/src/gallium/drivers/radeonsi/si_debug.c
+++ b/src/gallium/drivers/radeonsi/si_debug.c
@@ -20,21 +20,21 @@
* 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 "si_pipe.h"
#include "si_compute.h"
#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"
#include "ac_debug.h"
static void si_dump_bo_list(struct si_context *sctx,
const struct radeon_saved_cs *saved, FILE *f);
DEBUG_GET_ONCE_OPTION(replace_shaders, "RADEON_REPLACE_SHADERS", NULL)
diff --git a/src/gallium/drivers/radeonsi/si_pipe.c
b/src/gallium/drivers/radeonsi/si_pipe.c
index 4928e6f..466546b 100644
--- a/src/gallium/drivers/radeonsi/si_pipe.c
+++ b/src/gallium/drivers/radeonsi/si_pipe.c
@@ -30,21 +30,21 @@
#include "radeon/radeon_uvd.h"
#include "util/hash_table.h"
#include "util/u_log.h"
#include "util/u_memory.h"
#include "util/u_suballoc.h"
#include "util/u_tests.h"
#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: */
{ "vs", DBG(VS), "Print vertex shaders" },
{ "ps", DBG(PS), "Print pixel shaders" },
{ "gs", DBG(GS), "Print geometry shaders" },
{ "tcs", DBG(TCS), "Print tessellation control shaders" },
{ "tes", DBG(TES), "Print tessellation evaluation shaders" },
{ "cs", DBG(CS), "Print compute shaders" },
{ "noir", DBG(NO_IR), "Don't print the LLVM IR"},
diff --git a/src/gallium/drivers/rbug/Makefile.am
b/src/gallium/drivers/rbug/Makefile.am
deleted file mode 100644
index c784d84..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 meson.build
diff --git a/src/gallium/drivers/rbug/Makefile.sources
b/src/gallium/drivers/rbug/Makefile.sources
deleted file mode 100644
index f9f1d5c..0000000
--- 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 63209ab..0000000
--- 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 9c74171..0000000
--- 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 9c834a6..0000000
--- 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 4c019a3..0000000
--- 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 7397983..0000000
--- 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 4fc5d8b..0000000
--- 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 6822511..c4dd8e1 100644
--- a/src/gallium/meson.build
+++ b/src/gallium/meson.build
@@ -17,24 +17,20 @@
# 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.
inc_gallium_drivers = include_directories('drivers')
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')
else
libswdri = []
endif
if with_gallium_drisw_kms
subdir('winsys/sw/kms-dri')
else
libswkmsdri = []
diff --git a/src/gallium/state_trackers/osmesa/Makefile.am
b/src/gallium/state_trackers/osmesa/Makefile.am
index e5f2a5e..05e3ca0 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 meson.build
diff --git a/src/gallium/state_trackers/osmesa/meson.build
b/src/gallium/state_trackers/osmesa/meson.build
index dacf105..912a622 100644
--- a/src/gallium/state_trackers/osmesa/meson.build
+++ b/src/gallium/state_trackers/osmesa/meson.build
@@ -14,15 +14,15 @@
# 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.
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 c2aae0c..69cebbc 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 meson.build
TARGET_DRIVERS =
TARGET_CPPFLAGS =
TARGET_LIB_DEPS =
diff --git a/src/gallium/targets/d3dadapter9/meson.build
b/src/gallium/targets/d3dadapter9/meson.build
index 2cdc0e0..bd05b4f 100644
--- a/src/gallium/targets/d3dadapter9/meson.build
+++ b/src/gallium/targets/d3dadapter9/meson.build
@@ -18,25 +18,21 @@
# 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.
# TODO: support non-static targets
# Static targets are always enabled in autotools (unless you modify
# configure.ac)
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 = []
if with_ld_version_script
gallium_nine_ld_args += ['-Wl,--version-script',
join_paths(meson.current_source_dir(), 'd3dadapter9.sym')]
gallium_nine_link_depends += files('d3dadapter9.sym')
endif
libgallium_nine = shared_library(
'd3dadapter9',
@@ -45,22 +41,22 @@ libgallium_nine = shared_library(
inc_include, inc_src, inc_loader, inc_mapi, inc_mesa, inc_util,
inc_dri_common, inc_gallium, inc_gallium_aux, inc_gallium_winsys,
inc_gallium_drivers, inc_d3d9,
include_directories('../../state_trackers/nine'),
],
c_args : [c_vis_args, gallium_nine_c_args],
cpp_args : [cpp_vis_args],
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 : [
dep_selinux, dep_expat, dep_libdrm, dep_llvm,
driver_swrast, driver_r300, driver_r600, driver_radeonsi, driver_nouveau,
driver_i915, driver_svga,
],
name_prefix : '',
version : '.'.join(nine_version),
install : true,
diff --git a/src/gallium/targets/dri/Makefile.am
b/src/gallium/targets/dri/Makefile.am
index c6a4c21..a0778b6 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 \
$(LIBDRM_LIBS) \
$(SELINUX_LIBS) \
$(EXPAT_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/dri/SConscript
b/src/gallium/targets/dri/SConscript
index ff6ce3b..69cce3e 100644
--- a/src/gallium/targets/dri/SConscript
+++ b/src/gallium/targets/dri/SConscript
@@ -7,27 +7,20 @@ if env['suncc']:
Return()
env.Append(CPPPATH = [
'#/src/loader',
'#/src/mapi',
'#/src/mesa',
'#/src/mesa/drivers/dri/common',
'#/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])
env.PkgUseModules('DRM')
env.Append(CPPDEFINES = [
'GALLIUM_VMWGFX',
'GALLIUM_SOFTPIPE',
])
diff --git a/src/gallium/targets/dri/meson.build
b/src/gallium/targets/dri/meson.build
index 3440297..bdbd458 100644
--- a/src/gallium/targets/dri/meson.build
+++ b/src/gallium/targets/dri/meson.build
@@ -16,26 +16,21 @@
# 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.
# TODO: support non-static targets
# 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 = []
if with_ld_version_script
gallium_dri_ld_args += ['-Wl,--version-script',
join_paths(meson.current_source_dir(), 'dri.sym')]
gallium_dri_link_depends += files('dri.sym')
endif
if with_ld_dynamic_list
gallium_dri_ld_args += ['-Wl,--dynamic-list',
join_paths(meson.current_source_dir(), '../dri-vdpau.dyn')]
@@ -48,22 +43,22 @@ libgallium_dri = shared_library(
include_directories : [
inc_common, inc_util, inc_dri_common, inc_gallium_drivers,
inc_gallium_winsys, include_directories('../../state_trackers/dri'),
],
c_args : [c_vis_args],
cpp_args : [cpp_vis_args],
link_args : [ld_args_gc_sections, gallium_dri_ld_args],
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,
driver_swrast, driver_r300, driver_r600, driver_radeonsi, driver_nouveau,
driver_pl111, driver_vc4, driver_vc5, driver_freedreno, driver_etnaviv,
driver_imx, driver_tegra, driver_i915, driver_svga, driver_virgl,
driver_swr,
],
)
diff --git a/src/gallium/targets/graw-gdi/SConscript
b/src/gallium/targets/graw-gdi/SConscript
index 67d4373..e59127c 100644
--- a/src/gallium/targets/graw-gdi/SConscript
+++ b/src/gallium/targets/graw-gdi/SConscript
@@ -16,22 +16,22 @@ env.Prepend(LIBS = [
'user32',
'ws2_32',
])
sources = [
'graw_gdi.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')
env.Prepend(LIBS = [llvmpipe])
graw = env.SharedLibrary(
target = 'graw',
source = sources,
LIBS = ws_gdi + env['LIBS'],
)
diff --git a/src/gallium/targets/graw-xlib/SConscript
b/src/gallium/targets/graw-xlib/SConscript
index bf9cf72..3c6a856 100644
--- a/src/gallium/targets/graw-xlib/SConscript
+++ b/src/gallium/targets/graw-xlib/SConscript
@@ -13,30 +13,28 @@ env.Prepend(LIBS = [
env.Append(LIBS = env['X11_LIBS'])
env.Append(LIBPATH = env['X11_LIBPATH'])
env.Append(CPPPATH = [
'#src/gallium/drivers',
'#src/gallium/include/state_tracker',
'#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')
env.Prepend(LIBS = [llvmpipe])
graw = env.SharedLibrary(
target ='graw',
source = sources,
)
diff --git a/src/gallium/targets/haiku-softpipe/SConscript
b/src/gallium/targets/haiku-softpipe/SConscript
index 89792fb..ff5adc1 100644
--- a/src/gallium/targets/haiku-softpipe/SConscript
+++ b/src/gallium/targets/haiku-softpipe/SConscript
@@ -1,31 +1,27 @@
Import('*')
env.Prepend(LIBS = [
ws_haiku,
st_haiku,
- trace,
- rbug,
mesautil,
compiler,
mesa,
glsl,
nir,
spirv,
gallium
])
if True:
env.Append(CPPDEFINES = [
'GALLIUM_SOFTPIPE',
- 'GALLIUM_RBUG',
- 'GALLIUM_TRACE',
])
env.Prepend(LIBS = [softpipe])
env.Prepend(LIBS = [libgl])
env.Append(CPPPATH = [
'#/src/mapi',
'#/src/mesa',
'#/src/mesa/main',
'#/include/HaikuGL',
diff --git a/src/gallium/targets/haiku-softpipe/meson.build
b/src/gallium/targets/haiku-softpipe/meson.build
index 84bcea4..619706d 100644
--- a/src/gallium/targets/haiku-softpipe/meson.build
+++ b/src/gallium/targets/haiku-softpipe/meson.build
@@ -23,18 +23,18 @@ libswpipe = shared_library(
files('SoftwareRenderer.cpp', 'GalliumContext.cpp'),
include_directories : [
inc_common, inc_util, inc_haikugl, inc_gallium_drivers, inc_gallium_winsys,
include_directories('../../state_trackers/hgl'),
include_directories('/boot/system/develop/headers/private')
],
c_args : [c_vis_args],
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 : [
driver_swrast, cpp.find_library('be'), cpp.find_library('translation'),
cpp.find_library('network'), dep_unwind
]
)
diff --git a/src/gallium/targets/libgl-gdi/SConscript
b/src/gallium/targets/libgl-gdi/SConscript
index b5ba0fa..a8bdc3e 100644
--- a/src/gallium/targets/libgl-gdi/SConscript
+++ b/src/gallium/targets/libgl-gdi/SConscript
@@ -38,22 +38,20 @@ if env['llvm']:
env.Append(CPPDEFINES = 'HAVE_SWR')
drivers += [swr]
if env['gcc'] and env['machine'] != 'x86_64':
# DEF parser in certain versions of MinGW is busted, as does not behave as
# MSVC. mingw-w64 works fine.
sources += ['#src/gallium/state_trackers/wgl/opengl32.mingw.def']
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
# shared_glapi respectively
if env['gles']:
env.Prepend(LIBPATH = [shared_glapi.dir])
glapi = [bridge_glapi, 'libglapi']
opengl32 = env.SharedLibrary(
target ='opengl32',
diff --git a/src/gallium/targets/libgl-xlib/Makefile.am
b/src/gallium/targets/libgl-xlib/Makefile.am
index 1c62294..56d548e 100644
--- a/src/gallium/targets/libgl-xlib/Makefile.am
+++ b/src/gallium/targets/libgl-xlib/Makefile.am
@@ -28,23 +28,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@GL_LIB@.la
nodist_EXTRA_lib@GL_LIB@_la_SOURCES = dummy.cpp
lib@GL_LIB@_la_SOURCES = xlib.c
lib@GL_LIB@_la_LDFLAGS = \
-no-undefined \
-version-number 1:5:0 \
@@ -54,22 +52,20 @@ lib@GL_LIB@_la_LDFLAGS = \
if HAVE_LD_VERSION_SCRIPT
lib@GL_LIB@_la_LDFLAGS += \
-Wl,--version-script=$(top_srcdir)/src/gallium/targets/libgl-xlib/libgl-xlib.sym
endif
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 \
$(SHARED_GLAPI_LIB) \
$(GL_LIB_DEPS) \
$(CLOCK_LIB) \
$(LIBUNWIND_LIBS)
if HAVE_GALLIUM_LLVM
lib@GL_LIB@_la_LIBADD +=
$(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la $(LLVM_LIBS)
diff --git a/src/gallium/targets/libgl-xlib/SConscript
b/src/gallium/targets/libgl-xlib/SConscript
index b94ef35..fb7a0ce 100644
--- a/src/gallium/targets/libgl-xlib/SConscript
+++ b/src/gallium/targets/libgl-xlib/SConscript
@@ -35,22 +35,22 @@ env.Prepend(LIBS = [
nir,
spirv,
gallium,
])
sources = [
'xlib.c',
]
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'])
env.Prepend(LIBS = [llvmpipe])
if env['swr']:
env.Append(CPPDEFINES = 'GALLIUM_SWR')
env.Prepend(LIBS = [swr])
if env['platform'] != 'darwin':
diff --git a/src/gallium/targets/libgl-xlib/meson.build
b/src/gallium/targets/libgl-xlib/meson.build
index 6884c82..3d197ba 100644
--- a/src/gallium/targets/libgl-xlib/meson.build
+++ b/src/gallium/targets/libgl-xlib/meson.build
@@ -17,22 +17,20 @@
# 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.
# TODO: support non-static targets
# Static targets are always enabled in autotools (unless you modify
# configure.ac)
gallium_xlib_c_args = [
'-DGALLIUM_SOFTPIPE',
- '-DGALLIUM_RBUG',
- '-DGALLIUME_TRACE',
]
gallium_xlib_ld_args = []
gallium_xlib_link_with = []
gallium_xlib_link_depends = []
if with_ld_version_script
gallium_xlib_ld_args += ['-Wl,--version-script',
join_paths(meson.current_source_dir(), 'libgl-xlib.sym')]
gallium_xlib_link_depends += files('libgl-xlib.sym')
endif
if with_shared_glapi
@@ -43,17 +41,17 @@ libgl = shared_library(
'GL',
files('xlib.c'),
include_directories : [
inc_common, inc_gallium_winsys, inc_gallium_drivers,
include_directories('../../state_trackers/glx/xlib'),
],
c_args : [c_vis_args, gallium_xlib_c_args],
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],
install : true,
version : '1.5.0',
)
diff --git a/src/gallium/targets/osmesa/Makefile.am
b/src/gallium/targets/osmesa/Makefile.am
index f8bee5e..dc4d49e 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@OSMESA_LIB@.la
nodist_EXTRA_lib@OSMESA_LIB@_la_SOURCES = dummy.cpp
lib@OSMESA_LIB@_la_SOURCES = target.c
lib@OSMESA_LIB@_la_LDFLAGS = \
-no-undefined \
-version-number @OSMESA_VERSION@ \
$(GC_SECTIONS) \
@@ -53,21 +52,20 @@ lib@OSMESA_LIB@_la_LDFLAGS += \
endif
if HAVE_SHARED_GLAPI
SHARED_GLAPI_LIB = $(top_builddir)/src/mapi/shared-glapi/libglapi.la
endif
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 \
$(SHARED_GLAPI_LIB) \
$(OSMESA_LIB_DEPS) \
$(CLOCK_LIB) \
$(LIBUNWIND_LIBS)
if HAVE_GALLIUM_LLVM
AM_CPPFLAGS += -DGALLIUM_LLVMPIPE
diff --git a/src/gallium/targets/osmesa/SConscript
b/src/gallium/targets/osmesa/SConscript
index ccf7d51..f49f1fe 100644
--- a/src/gallium/targets/osmesa/SConscript
+++ b/src/gallium/targets/osmesa/SConscript
@@ -8,29 +8,28 @@ env.Prepend(CPPPATH = [
#Dir('../../../mapi'), # src/mapi build path for python-generated GL API
files/headers
])
env.Prepend(LIBS = [
st_osmesa,
ws_null,
glapi,
compiler,
mesa,
gallium,
- trace,
glsl,
nir,
spirv,
mesautil,
softpipe
])
-env.Append(CPPDEFINES = ['GALLIUM_TRACE', 'GALLIUM_SOFTPIPE'])
+env.Append(CPPDEFINES = ['GALLIUM_SOFTPIPE'])
sources = ['target.c']
if env['llvm']:
env.Append(CPPDEFINES = 'GALLIUM_LLVMPIPE')
env.Prepend(LIBS = [llvmpipe])
if env['swr']:
env.Append(CPPDEFINES = 'GALLIUM_SWR')
env.Prepend(LIBS = [swr])
diff --git a/src/gallium/targets/osmesa/meson.build
b/src/gallium/targets/osmesa/meson.build
index e51c54f..b4ae8f4 100644
--- a/src/gallium/targets/osmesa/meson.build
+++ b/src/gallium/targets/osmesa/meson.build
@@ -28,32 +28,31 @@ endif
if with_ld_version_script
osmesa_link_args += [
'-Wl,--version-script', join_paths(meson.current_source_dir(),
'osmesa.sym')
]
osmesa_link_deps += files('osmesa.sym')
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 : [
inc_include, inc_src, inc_gallium, inc_gallium_aux, inc_gallium_winsys,
inc_gallium_drivers,
],
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,
driver_swrast, driver_swr,
],
version : '8.0.0',
install : true,
)
pkg.generate(
diff --git a/src/gallium/targets/pipe-loader/Makefile.am
b/src/gallium/targets/pipe-loader/Makefile.am
index bddc4e8..fa16e85 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/targets/pipe-loader/meson.build
b/src/gallium/targets/pipe-loader/meson.build
index 7466d98..5a44102 100644
--- a/src/gallium/targets/pipe-loader/meson.build
+++ b/src/gallium/targets/pipe-loader/meson.build
@@ -13,22 +13,22 @@
# 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.
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,
]
if (with_gallium_va or with_gallium_vdpau or with_gallium_omx != 'disabled' or
with_gallium_xvmc or with_dri)
pipe_loader_link_with += libgalliumvl
else
pipe_loader_link_with += libgalliumvl_stubs
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
--
2.7.4
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
