diff options
Diffstat (limited to 'src/gallium/targets/dri')
| -rw-r--r-- | src/gallium/targets/dri/Makefile.am | 10 | ||||
| -rw-r--r-- | src/gallium/targets/dri/SConscript | 7 | ||||
| -rw-r--r-- | src/gallium/targets/dri/meson.build | 11 |
3 files changed, 4 insertions, 24 deletions
diff --git a/src/gallium/targets/dri/Makefile.am b/src/gallium/targets/dri/Makefile.am index c6a4c215905..a0778b64e58 100644 --- a/src/gallium/targets/dri/Makefile.am +++ b/src/gallium/targets/dri/Makefile.am @@ -9,11 +9,7 @@ AM_CFLAGS = \ $(GALLIUM_TARGET_CFLAGS) AM_CPPFLAGS = \ - $(DEFINES) \ - -DGALLIUM_DDEBUG \ - -DGALLIUM_NOOP \ - -DGALLIUM_RBUG \ - -DGALLIUM_TRACE + $(DEFINES) dridir = $(DRI_DRIVER_INSTALL_DIR) dri_LTLIBRARIES = gallium_dri.la @@ -47,10 +43,6 @@ gallium_dri_la_LIBADD = \ $(top_builddir)/src/gallium/state_trackers/dri/libdri.la \ $(top_builddir)/src/gallium/auxiliary/libgalliumvl.la \ $(top_builddir)/src/gallium/auxiliary/libgallium.la \ - $(top_builddir)/src/gallium/drivers/ddebug/libddebug.la \ - $(top_builddir)/src/gallium/drivers/noop/libnoop.la \ - $(top_builddir)/src/gallium/drivers/rbug/librbug.la \ - $(top_builddir)/src/gallium/drivers/trace/libtrace.la \ $(top_builddir)/src/mapi/shared-glapi/libglapi.la \ $(LIBDRM_LIBS) \ $(SELINUX_LIBS) \ diff --git a/src/gallium/targets/dri/SConscript b/src/gallium/targets/dri/SConscript index ff6ce3bf4e0..69cce3e95fa 100644 --- a/src/gallium/targets/dri/SConscript +++ b/src/gallium/targets/dri/SConscript @@ -14,13 +14,6 @@ env.Append(CPPPATH = [ '#/src/gallium/state_trackers/dri', ]) -if env['build'] == 'release': - env.Append(CPPDEFINES = ['GALLIUM_RBUG']) - env.Prepend(LIBS = [rbug]) -else: - env.Append(CPPDEFINES = ['GALLIUM_TRACE', 'GALLIUM_RBUG']) - env.Prepend(LIBS = [trace, rbug]) - if env['llvm']: env.Append(CPPDEFINES = 'GALLIUM_LLVMPIPE') env.Prepend(LIBS = [llvmpipe]) diff --git a/src/gallium/targets/dri/meson.build b/src/gallium/targets/dri/meson.build index 34402975386..bdbd45839ad 100644 --- a/src/gallium/targets/dri/meson.build +++ b/src/gallium/targets/dri/meson.build @@ -23,12 +23,7 @@ # Static targets are always enabled in autotools (unless you modify # configure.ac) -gallium_dri_c_args = [ - '-DGALLIUM_DDEBUG', - '-DGALLIUM_NOOP', - '-DGALLIUM_RBUG', - '-DGALLIUME_TRACE', -] +gallium_dri_c_args = [] gallium_dri_ld_args = [] gallium_dri_link_depends = [] gallium_dri_drivers = [] @@ -55,8 +50,8 @@ libgallium_dri = shared_library( link_depends : gallium_dri_link_depends, link_with : [ libmesa_gallium, libdricommon, libmegadriver_stub, libdri, libgalliumvl, - libgallium, libddebug, libnoop, librbug, libtrace, libglapi, - libpipe_loader_static, libws_null, libwsw, libswdri, libswkmsdri, + libgallium, libglapi, libpipe_loader_static, libws_null, libwsw, libswdri, + libswkmsdri, ], dependencies : [ dep_selinux, dep_expat, dep_libdrm, dep_llvm, dep_thread, |