commit 6a6b09c9b62b003ca96b036d0249db5ce99cc269
author Jamie Madill <jmadill@chromium.org> Thu Jan 12 21:52:29 2017 +0000
committer Commit Bot <commit-bot@chromium.org> Thu Jan 12 23:19:49 2017 +0000
tree f25b71070c817aa8bfd2271906e68da3b4d637dc
parent b4533de1fdf7f5ac2fb4824582e13cb55ca94dd8

Revert "Replace gl::trace logging with Chromium style logging"

Failing Chromium static initializers check:

FAILED linux-release-64/sizes/chrome-si/initializers: actual 8, expected 7, better lower

Possibly due to the static initializer for std::array for
the log severity types. We should change it to POD.

BUG=angleproject:1660

This reverts commit afcc41cee4ff63e7f6c9e60e55fc061adbba7dd4.

Change-Id: Ifb362a4af78542608397c7a0b19e6afe076f2cf3
Reviewed-on: https://chromium-review.googlesource.com/427235
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>

src/libANGLE/renderer/d3d/ProgramD3D.cpp

diff --git a/src/libANGLE/renderer/d3d/ProgramD3D.cpp b/src/libANGLE/renderer/d3d/ProgramD3D.cpp
index 420d8ee..0bdf125 100644
--- a/src/libANGLE/renderer/d3d/ProgramD3D.cpp
+++ b/src/libANGLE/renderer/d3d/ProgramD3D.cpp
@@ -1091,8 +1091,9 @@
     }
     else if (!infoLog)
     {
-        ERR() << "Error compiling dynamic pixel executable:" << std::endl
-              << tempInfoLog.str() << std::endl;
+        std::vector<char> tempCharBuffer(tempInfoLog.getLength() + 3);
+        tempInfoLog.getLog(static_cast<GLsizei>(tempInfoLog.getLength()), NULL, &tempCharBuffer[0]);
+        ERR("Error compiling dynamic pixel executable:\n%s\n", &tempCharBuffer[0]);
     }
 
     *outExectuable = pixelExecutable;
@@ -1136,8 +1137,9 @@
     }
     else if (!infoLog)
     {
-        ERR() << "Error compiling dynamic vertex executable:" << std::endl
-              << tempInfoLog.str() << std::endl;
+        std::vector<char> tempCharBuffer(tempInfoLog.getLength() + 3);
+        tempInfoLog.getLog(static_cast<GLsizei>(tempInfoLog.getLength()), NULL, &tempCharBuffer[0]);
+        ERR("Error compiling dynamic vertex executable:\n%s\n", &tempCharBuffer[0]);
     }
 
     *outExectuable = vertexExecutable;
@@ -1185,8 +1187,9 @@
 
     if (!infoLog && error.isError())
     {
-        ERR() << "Error compiling dynamic geometry executable:" << std::endl
-              << tempInfoLog.str() << std::endl;
+        std::vector<char> tempCharBuffer(tempInfoLog.getLength() + 3);
+        tempInfoLog.getLog(static_cast<GLsizei>(tempInfoLog.getLength()), NULL, &tempCharBuffer[0]);
+        ERR("Error compiling dynamic geometry executable:\n%s\n", &tempCharBuffer[0]);
     }
 
     if (outExecutable)