fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-06 06:40:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

meson: Remove the non-used -DDEBUG manually

Browse source 
And also remove the workarounds for LLVM and bellagio

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Acked-by: David Heidelberg <david.heidelberg@collabora.com>
Reviewed-by: Eric Engestrom <eric@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28092>
This commit is contained in:
Yonggang Luo 2024-03-09 04:34:01 +08:00 • committed by Marge Bot
parent 1ac1c0843f
commit 1d18aba016
4 changed files with 0 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
meson.build
View file

@ -956,11 +956,6 @@ if cc.get_define('ETIME', prefix : '#include <errno.h>') == ''
pre_args += '-DETIME=ETIMEDOUT'
endif
# Define DEBUG for debug builds only (debugoptimized is not included on this one)
if with_mesa_debug
pre_args += '-DDEBUG'
endif
# Define MESA_DEBUG to 1 for debug builds only (debugoptimized is not included on this one);
# otherwise define MESA_DEBUG to 0
pre_args += '-DMESA_DEBUG=' + (with_mesa_debug ? '1' : '0')

13
src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
View file

@ -42,14 +42,6 @@
#include <stddef.h>
#include <llvm/Config/llvm-config.h>
#if LLVM_VERSION_MAJOR < 7
// Workaround http://llvm.org/PR23628
#pragma push_macro("DEBUG")
#undef DEBUG
#endif
#include <llvm/Config/llvm-config.h>
#include <llvm-c/Core.h>
#include <llvm-c/Support.h>
@ -87,11 +79,6 @@
#include <llvm/ExecutionEngine/JITEventListener.h>
#endif
#if LLVM_VERSION_MAJOR < 7
// Workaround http://llvm.org/PR23628
#pragma pop_macro("DEBUG")
#endif
#include "c11/threads.h"
#include "util/u_thread.h"
#include "util/detect.h"

6
src/gallium/frontends/omx/bellagio/vid_dec.c
View file

@ -36,13 +36,7 @@
#include <OMX_Video.h>
/* bellagio defines a DEBUG macro that we don't want */
#if !MESA_DEBUG
#include <bellagio/omxcore.h>
#undef DEBUG
#else
#include <bellagio/omxcore.h>
#endif
#include "pipe/p_screen.h"
#include "pipe/p_video_codec.h"

7
src/gallium/frontends/omx/bellagio/vid_enc.c
View file

@ -36,14 +36,7 @@
#include <OMX_Video.h>
/* bellagio defines a DEBUG macro that we don't want */
#if !MESA_DEBUG
#include <bellagio/omxcore.h>
#undef DEBUG
#else
#include <bellagio/omxcore.h>
#endif
#include <bellagio/omx_base_video_port.h>
#include "pipe/p_screen.h"