diff options
| author | Austin Kinross <aukinros@microsoft.com> | 2014-10-20 14:26:13 -0700 |
|---|---|---|
| committer | Geoff Lang <geofflang@chromium.org> | 2014-10-28 19:26:57 +0000 |
| commit | f0360c600497de805722f178417ed2f1d4b7567c (patch) | |
| tree | 6a7aa5a5786f977e3c9b4b185699750bf4297c51 | |
| parent | 570e83cfe0628176583cd47a08de816694426e25 (diff) | |
| download | angle-f0360c600497de805722f178417ed2f1d4b7567c.tar.gz | |
Rename ANGLE_ENABLE_TRACE -> ANGLE_ENABLE_DEBUG_TRACE
Change-Id: Ib70c456c8d01161e370b9165ff4daa2f0f90c840
Reviewed-on: https://chromium-review.googlesource.com/223591
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>
| -rw-r--r-- | src/common/debug.cpp | 10 | ||||
| -rw-r--r-- | src/common/debug.h | 10 | ||||
| -rw-r--r-- | src/libEGL/main.cpp | 2 |
3 files changed, 11 insertions, 11 deletions
diff --git a/src/common/debug.cpp b/src/common/debug.cpp index b6c52016..42fe1f43 100644 --- a/src/common/debug.cpp +++ b/src/common/debug.cpp @@ -25,7 +25,7 @@ typedef void (*PerfOutputFunction)(unsigned int, const wchar_t*); static void output(bool traceFileDebugOnly, PerfOutputFunction perfFunc, const char *format, va_list vararg) { -#if defined(ANGLE_ENABLE_DEBUG_ANNOTATIONS) || defined(ANGLE_ENABLE_TRACE) +#if defined(ANGLE_ENABLE_DEBUG_ANNOTATIONS) || defined(ANGLE_ENABLE_DEBUG_TRACE) std::string formattedMessage = FormatString(format, vararg); #endif @@ -45,7 +45,7 @@ static void output(bool traceFileDebugOnly, PerfOutputFunction perfFunc, const c } #endif // ANGLE_ENABLE_DEBUG_ANNOTATIONS -#if defined(ANGLE_ENABLE_TRACE) +#if defined(ANGLE_ENABLE_DEBUG_TRACE) #if defined(NDEBUG) if (traceFileDebugOnly) { @@ -60,7 +60,7 @@ static void output(bool traceFileDebugOnly, PerfOutputFunction perfFunc, const c file.flush(); } -#endif // ANGLE_ENABLE_TRACE +#endif // ANGLE_ENABLE_DEBUG_TRACE } void trace(bool traceFileDebugOnly, const char *format, ...) @@ -87,12 +87,12 @@ bool perfActive() ScopedPerfEventHelper::ScopedPerfEventHelper(const char* format, ...) { -#if !defined(ANGLE_ENABLE_TRACE) +#if !defined(ANGLE_ENABLE_DEBUG_TRACE) if (!perfActive()) { return; } -#endif // !ANGLE_ENABLE_TRACE +#endif // !ANGLE_ENABLE_DEBUG_TRACE va_list vararg; va_start(vararg, format); #if defined(ANGLE_ENABLE_DEBUG_ANNOTATIONS) diff --git a/src/common/debug.h b/src/common/debug.h index a8ac4aaf..0874b68e 100644 --- a/src/common/debug.h +++ b/src/common/debug.h @@ -39,28 +39,28 @@ namespace gl } // A macro to output a trace of a function call and its arguments to the debugging log -#if defined(ANGLE_ENABLE_TRACE) || defined(ANGLE_ENABLE_DEBUG_ANNOTATIONS) +#if defined(ANGLE_ENABLE_DEBUG_TRACE) || defined(ANGLE_ENABLE_DEBUG_ANNOTATIONS) #define TRACE(message, ...) gl::trace(true, "trace: %s(%d): " message "\n", __FUNCTION__, __LINE__, ##__VA_ARGS__) #else #define TRACE(message, ...) (void(0)) #endif // A macro to output a function call and its arguments to the debugging log, to denote an item in need of fixing. -#if defined(ANGLE_ENABLE_TRACE) || defined(ANGLE_ENABLE_DEBUG_ANNOTATIONS) +#if defined(ANGLE_ENABLE_DEBUG_TRACE) || defined(ANGLE_ENABLE_DEBUG_ANNOTATIONS) #define FIXME(message, ...) gl::trace(false, "fixme: %s(%d): " message "\n", __FUNCTION__, __LINE__, ##__VA_ARGS__) #else #define FIXME(message, ...) (void(0)) #endif // A macro to output a function call and its arguments to the debugging log, in case of error. -#if defined(ANGLE_ENABLE_TRACE) || defined(ANGLE_ENABLE_DEBUG_ANNOTATIONS) +#if defined(ANGLE_ENABLE_DEBUG_TRACE) || defined(ANGLE_ENABLE_DEBUG_ANNOTATIONS) #define ERR(message, ...) gl::trace(false, "err: %s(%d): " message "\n", __FUNCTION__, __LINE__, ##__VA_ARGS__) #else #define ERR(message, ...) (void(0)) #endif // A macro to log a performance event around a scope. -#if defined(ANGLE_ENABLE_TRACE) || defined(ANGLE_ENABLE_DEBUG_ANNOTATIONS) +#if defined(ANGLE_ENABLE_DEBUG_TRACE) || defined(ANGLE_ENABLE_DEBUG_ANNOTATIONS) #if defined(_MSC_VER) #define EVENT(message, ...) gl::ScopedPerfEventHelper scopedPerfEventHelper ## __LINE__("%s" message "\n", __FUNCTION__, __VA_ARGS__); #else @@ -83,7 +83,7 @@ namespace gl #define UNUSED_ASSERTION_VARIABLE(variable) ((void)variable) #endif -#ifndef ANGLE_ENABLE_TRACE +#ifndef ANGLE_ENABLE_DEBUG_TRACE #define UNUSED_TRACE_VARIABLE(variable) ((void)variable) #else #define UNUSED_TRACE_VARIABLE(variable) diff --git a/src/libEGL/main.cpp b/src/libEGL/main.cpp index 0f8439c4..aa4333e6 100644 --- a/src/libEGL/main.cpp +++ b/src/libEGL/main.cpp @@ -55,7 +55,7 @@ extern "C" BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved { case DLL_PROCESS_ATTACH: { -#if defined(ANGLE_ENABLE_TRACE) +#if defined(ANGLE_ENABLE_DEBUG_TRACE) FILE *debug = fopen(TRACE_OUTPUT_FILE, "rt"); if (debug) |