Clean up trace output.

Removes the "EVENT: " prefix from every trace message. Also removes the extra blank line between trace entries. And fixes a missing space in EGL_WaitSyncKHR. Bug: angleproject:3815 Change-Id: Id6321357a56477da29de121abb51c721b11d99da Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1756084Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>

Clean up trace output.
b8482ab7 · Jamie Madill · Commit Bot · 486f381f · b8482ab7 · b8482ab7
Commit b8482ab7 authored Aug 15, 2019 by Jamie Madill Committed by Commit Bot Aug 16, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

debug.cpp src/common/debug.cpp +5 -1

entry_points_egl_ext.cpp src/libGLESv2/entry_points_egl_ext.cpp +1 -1

No files found.
--- a/src/common/debug.cpp
+++ b/src/common/debug.cpp
@@ -255,7 +255,11 @@ void Trace(LogSeverity severity, const char *message)
    static angle::base::NoDestructor<std::ofstream> file(TRACE_OUTPUT_FILE, std::ofstream::app);
    if (file->good())
    {
-        *file << LogSeverityName(severity) << ": " << str << std::endl;
+        if (severity > LOG_EVENT)
+        {
+            *file << LogSeverityName(severity) << ": ";
+        }
+        *file << str;
        file->flush();
    }
 #endif  // defined(ANGLE_ENABLE_DEBUG_TRACE)

--- a/src/libGLESv2/entry_points_egl_ext.cpp
+++ b/src/libGLESv2/entry_points_egl_ext.cpp
@@ -979,7 +979,7 @@ ANGLE_EXPORT EGLBoolean EGLAPIENTRY EGL_GetSyncAttribKHR(EGLDisplay dpy,
 ANGLE_EXPORT EGLBoolean EGLAPIENTRY EGL_WaitSyncKHR(EGLDisplay dpy, EGLSync sync, EGLint flags)
 {
    ANGLE_SCOPED_GLOBAL_LOCK();
-    EVENT("(EGLDisplay dpy =0x%016" PRIxPTR "p, EGLSync sync = 0x%016" PRIxPTR
+    EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR "p, EGLSync sync = 0x%016" PRIxPTR
          ", EGLint flags = 0x%X)",
          (uintptr_t)dpy, (uintptr_t)sync, flags);