commit fe14d455c240b756a66ea2cb20ad3e22f9a12cec
author Austin Kinross <aukinros@microsoft.com> Mon Oct 20 14:36:18 2014 -0700
committer Geoff Lang <geofflang@chromium.org> Tue Oct 28 19:27:20 2014 +0000
tree 062f9e07d8a0220a0415b5c1fd815c8b9d44b3b2
parent f0360c600497de805722f178417ed2f1d4b7567c

Add ANGLE_ENABLE_DEBUG_TRACE_TO_DEBUGGER, to output trace to debugger window

Change-Id: I7be71c41b0ec3a77f508c90c2de3331c9522a11b
Reviewed-on: https://chromium-review.googlesource.com/223592
Reviewed-by: Shannon Woods <shannonwoods@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 42fe1f4..e09d560 100644
--- a/src/common/debug.cpp
+++ b/src/common/debug.cpp
@@ -23,7 +23,7 @@
 typedef void (*PerfOutputFunction)(unsigned int, const wchar_t*);
 #endif
 
-static void output(bool traceFileDebugOnly, PerfOutputFunction perfFunc, const char *format, va_list vararg)
+static void output(bool traceInDebugOnly, PerfOutputFunction perfFunc, const char *format, va_list vararg)
 {
 #if defined(ANGLE_ENABLE_DEBUG_ANNOTATIONS) || defined(ANGLE_ENABLE_DEBUG_TRACE)
     std::string formattedMessage = FormatString(format, vararg);
@@ -47,7 +47,7 @@
 
 #if defined(ANGLE_ENABLE_DEBUG_TRACE)
 #if defined(NDEBUG)
-    if (traceFileDebugOnly)
+    if (traceInDebugOnly)
     {
         return;
     }
@@ -60,17 +60,21 @@
         file.flush();
     }
 
+#if defined(ANGLE_ENABLE_DEBUG_TRACE_TO_DEBUGGER)
+    OutputDebugStringA(formattedMessage.c_str());
+#endif // ANGLE_ENABLE_DEBUG_TRACE_TO_DEBUGGER
+
 #endif // ANGLE_ENABLE_DEBUG_TRACE
 }
 
-void trace(bool traceFileDebugOnly, const char *format, ...)
+void trace(bool traceInDebugOnly, const char *format, ...)
 {
     va_list vararg;
     va_start(vararg, format);
 #if defined(ANGLE_ENABLE_DEBUG_ANNOTATIONS)
-    output(traceFileDebugOnly, D3DPERF_SetMarker, format, vararg);
+    output(traceInDebugOnly, D3DPERF_SetMarker, format, vararg);
 #else
-    output(traceFileDebugOnly, NULL, format, vararg);
+    output(traceInDebugOnly, NULL, format, vararg);
 #endif
     va_end(vararg);
 }