commit 570e83cfe0628176583cd47a08de816694426e25
author Austin Kinross <aukinros@microsoft.com> Mon Oct 20 14:13:58 2014 -0700
committer Geoff Lang <geofflang@chromium.org> Tue Oct 28 19:26:44 2014 +0000
tree faf88fcc571d635df893d0d17932b1642e2f93a1
parent 73b8de78488cc86651683c90306d1b0cfad34b6a

Rename ANGLE_ENABLE_PERF -> ANGLE_ENABLE_DEBUG_ANNOTATIONS

Change-Id: I701cd5ee749797428171e9c58a46fce626b9a969
Reviewed-on: https://chromium-review.googlesource.com/223590
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>

src/common/debug.cpp

diff --git a/src/common/debug.cpp b/src/common/debug.cpp
index 41e8b00..b6c5201 100644
--- a/src/common/debug.cpp
+++ b/src/common/debug.cpp
@@ -17,7 +17,7 @@
 
 namespace gl
 {
-#if defined(ANGLE_ENABLE_PERF)
+#if defined(ANGLE_ENABLE_DEBUG_ANNOTATIONS)
 typedef void (WINAPI *PerfOutputFunction)(D3DCOLOR, LPCWSTR);
 #else
 typedef void (*PerfOutputFunction)(unsigned int, const wchar_t*);
@@ -25,11 +25,11 @@
 
 static void output(bool traceFileDebugOnly, PerfOutputFunction perfFunc, const char *format, va_list vararg)
 {
-#if defined(ANGLE_ENABLE_PERF) || defined(ANGLE_ENABLE_TRACE)
+#if defined(ANGLE_ENABLE_DEBUG_ANNOTATIONS) || defined(ANGLE_ENABLE_TRACE)
     std::string formattedMessage = FormatString(format, vararg);
 #endif
 
-#if defined(ANGLE_ENABLE_PERF)
+#if defined(ANGLE_ENABLE_DEBUG_ANNOTATIONS)
     if (perfActive())
     {
         // The perf function only accepts wide strings, widen the ascii message
@@ -43,7 +43,7 @@
 
         perfFunc(0, wideMessage.c_str());
     }
-#endif // ANGLE_ENABLE_PERF
+#endif // ANGLE_ENABLE_DEBUG_ANNOTATIONS
 
 #if defined(ANGLE_ENABLE_TRACE)
 #if defined(NDEBUG)
@@ -67,7 +67,7 @@
 {
     va_list vararg;
     va_start(vararg, format);
-#if defined(ANGLE_ENABLE_PERF)
+#if defined(ANGLE_ENABLE_DEBUG_ANNOTATIONS)
     output(traceFileDebugOnly, D3DPERF_SetMarker, format, vararg);
 #else
     output(traceFileDebugOnly, NULL, format, vararg);
@@ -77,7 +77,7 @@
 
 bool perfActive()
 {
-#if defined(ANGLE_ENABLE_PERF)
+#if defined(ANGLE_ENABLE_DEBUG_ANNOTATIONS)
     static bool active = D3DPERF_GetStatus() != 0;
     return active;
 #else
@@ -95,17 +95,17 @@
 #endif // !ANGLE_ENABLE_TRACE
     va_list vararg;
     va_start(vararg, format);
-#if defined(ANGLE_ENABLE_PERF)
+#if defined(ANGLE_ENABLE_DEBUG_ANNOTATIONS)
     output(true, reinterpret_cast<PerfOutputFunction>(D3DPERF_BeginEvent), format, vararg);
 #else
     output(true, NULL, format, vararg);
-#endif // ANGLE_ENABLE_PERF
+#endif // ANGLE_ENABLE_DEBUG_ANNOTATIONS
     va_end(vararg);
 }
 
 ScopedPerfEventHelper::~ScopedPerfEventHelper()
 {
-#if defined(ANGLE_ENABLE_PERF)
+#if defined(ANGLE_ENABLE_DEBUG_ANNOTATIONS)
     if (perfActive())
     {
         D3DPERF_EndEvent();