Clean up EVENT() logging.

src/common/debug.cpp

@@ -139,13 +139,13 @@ void LogMessage::trace() const
     }
 
     std::ostringstream stream;
-    stream << LogSeverityName(mSeverity) << ": ";
-    // EVENT() don't require additional function(line) info
+    // EVENT() does not require additional function(line) info.
     if (mSeverity != LOG_EVENT)
     {
-        stream << mFunction << "(" << mLine << "): ";
+        stream << LogSeverityName(mSeverity) << ": " << mFunction << "(" << mLine << "): ";
     }
-    stream << mStream.str() << std::endl;
+    stream << mStream.str();
+
     std::string str(stream.str());
 
     if (DebugAnnotationsActive())
@@ -165,11 +165,18 @@ void LogMessage::trace() const
 
     if (mSeverity == LOG_ERR)
     {
-        std::cerr << str;
-#if !defined(NDEBUG) && defined(_MSC_VER)
+        std::cerr << str << std::endl;
+    }
+
+#if defined(ANGLE_PLATFORM_WINDOWS) && \
+    (defined(ANGLE_ENABLE_DEBUG_TRACE_TO_DEBUGGER) || !defined(NDEBUG))
+#if !defined(ANGLE_ENABLE_DEBUG_TRACE_TO_DEBUGGER)
+    if (mSeverity == LOG_ERR)
+#endif  // !defined(ANGLE_ENABLE_DEBUG_TRACE_TO_DEBUGGER)
+    {
         OutputDebugStringA(str.c_str());
-#endif  // !defined(NDEBUG) && defined(_MSC_VER)
     }
+#endif
 
 #if defined(ANGLE_ENABLE_DEBUG_TRACE)
 #if defined(NDEBUG)
@@ -177,19 +184,14 @@ void LogMessage::trace() const
     {
         return;
     }
-#endif  // NDEBUG
+#endif  // defined(NDEBUG)
     static std::ofstream file(TRACE_OUTPUT_FILE, std::ofstream::app);
     if (file)
     {
-        file.write(str.c_str(), str.length());
+        file << str << std::endl;
         file.flush();
     }
-
-#if defined(ANGLE_ENABLE_DEBUG_TRACE_TO_DEBUGGER)
-    OutputDebugStringA(str.c_str());
-#endif  // ANGLE_ENABLE_DEBUG_TRACE_TO_DEBUGGER
-
-#endif  // ANGLE_ENABLE_DEBUG_TRACE
+#endif  // defined(ANGLE_ENABLE_DEBUG_TRACE)
 }
 
 LogSeverity LogMessage::getSeverity() const