commit 14aa40f0213a9dbff02ab7200f058ad6bfa6f231
author Jamie Madill <jmadill@chromium.org> Wed Jan 07 15:12:47 2015 -0500
committer Jamie Madill <jmadill@chromium.org> Wed Jan 07 21:25:35 2015 +0000
tree be295e80890a5c7900788b8a1c38b8169af49b91
parent 054369e3c6c07e36e0ec4828a7f2efb93af5a2d1

Print ERR() errors to the debug output on Windows.

We can switch this on for Debug only. This will help developers
catch bugs more easily, and will only show up for internal
errors and major performance caveats. Currently it's far too easy
to miss these messages - it requires manually modifying debug.h,
looking at a text file and potentially also running Chromium with
an special flag.

BUG=angle:663

Change-Id: I75b3bd05fbc75d21607b9957134db8e8990c77b1
Reviewed-on: https://chromium-review.googlesource.com/239191
Tested-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>

src/common/debug.cpp

diff --git a/src/common/debug.cpp b/src/common/debug.cpp
index 49ed05d..ae38f0d 100644
--- a/src/common/debug.cpp
+++ b/src/common/debug.cpp
@@ -182,7 +182,8 @@
    DebugTraceOutputTypeBeginEvent
 };
 
-static void output(bool traceInDebugOnly, DebugTraceOutputType outputType, const char *format, va_list vararg)
+static void output(bool traceInDebugOnly, MessageType messageType, DebugTraceOutputType outputType,
+                   const char *format, va_list vararg)
 {
     if (perfActive())
     {
@@ -204,6 +205,20 @@
         }
     }
 
+    std::string formattedMessage;
+    UNUSED_TRACE_VARIABLE(formattedMessage);
+
+#if !defined(NDEBUG) && defined(_MSC_VER)
+    if (messageType == MESSAGE_ERR)
+    {
+        if (formattedMessage.empty())
+        {
+            formattedMessage = FormatString(format, vararg);
+        }
+        OutputDebugString(formattedMessage.c_str());
+    }
+#endif
+
 #if defined(ANGLE_ENABLE_DEBUG_TRACE)
 #if defined(NDEBUG)
     if (traceInDebugOnly)
@@ -211,7 +226,10 @@
         return;
     }
 #endif // NDEBUG
-    std::string formattedMessage = FormatString(format, vararg);
+    if (formattedMessage.empty())
+    {
+        formattedMessage = FormatString(format, vararg);
+    }
 
     static std::ofstream file(TRACE_OUTPUT_FILE, std::ofstream::app);
     if (file)
@@ -227,14 +245,14 @@
 #endif // ANGLE_ENABLE_DEBUG_TRACE
 }
 
-void trace(bool traceInDebugOnly, const char *format, ...)
+void trace(bool traceInDebugOnly, MessageType messageType, const char *format, ...)
 {
     va_list vararg;
     va_start(vararg, format);
 #if defined(ANGLE_ENABLE_DEBUG_ANNOTATIONS)
-    output(traceInDebugOnly, DebugTraceOutputTypeSetMarker, format, vararg);
+    output(traceInDebugOnly, messageType, DebugTraceOutputTypeSetMarker, format, vararg);
 #else
-    output(traceInDebugOnly, DebugTraceOutputTypeNone, format, vararg);
+    output(traceInDebugOnly, messageType, DebugTraceOutputTypeNone, format, vararg);
 #endif
     va_end(vararg);
 }
@@ -260,9 +278,9 @@
     va_list vararg;
     va_start(vararg, format);
 #if defined(ANGLE_ENABLE_DEBUG_ANNOTATIONS)
-    output(true, DebugTraceOutputTypeBeginEvent, format, vararg);
+    output(true, MESSAGE_EVENT, DebugTraceOutputTypeBeginEvent, format, vararg);
 #else
-    output(true, DebugTraceOutputTypeNone, format, vararg);
+    output(true, MESSAGE_EVENT, DebugTraceOutputTypeNone, format, vararg);
 #endif // ANGLE_ENABLE_DEBUG_ANNOTATIONS
     va_end(vararg);
 }