commit d2c52e3b7b5d4b13d2109a97e7bcce936c40aa3a
author Jamie Madill <jmadill@chromium.org> Wed Oct 14 17:07:05 2015 -0400
committer Jamie Madill <jmadill@chromium.org> Mon Oct 19 17:05:20 2015 +0000
tree c4b69ff1e8b8fbcfa67432b4c765e6d90afa1686
parent 277469666dab73787c58df150cfa976710a86d4d

Fix debug annotations and shaders.

The Program refactor inadvertantly broken Debug annotations. Fix this
by correctly passing the path to the temporary shader source in the
first "C" string argument to ShCompile, instead of as the first part
of the source string.

BUG=angleproject:1177
TEST=manual testing with MSVS

Change-Id: Ie77bb11b51645a474b542ddd2ae0f391e019e341
Reviewed-on: https://chromium-review.googlesource.com/306210
Tryjob-Request: Jamie Madill <jmadill@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>

src/tests/test_utils/ANGLETest.cpp

diff --git a/src/tests/test_utils/ANGLETest.cpp b/src/tests/test_utils/ANGLETest.cpp
index 4df5349..af124eb 100644
--- a/src/tests/test_utils/ANGLETest.cpp
+++ b/src/tests/test_utils/ANGLETest.cpp
@@ -122,10 +122,17 @@
         GLint infoLogLength;
         glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &infoLogLength);
 
-        std::vector<GLchar> infoLog(infoLogLength);
-        glGetShaderInfoLog(shader, static_cast<GLsizei>(infoLog.size()), NULL, &infoLog[0]);
+        if (infoLogLength == 0)
+        {
+            std::cerr << "shader compilation failed with empty log." << std::endl;
+        }
+        else
+        {
+            std::vector<GLchar> infoLog(infoLogLength);
+            glGetShaderInfoLog(shader, static_cast<GLsizei>(infoLog.size()), NULL, &infoLog[0]);
 
-        std::cerr << "shader compilation failed: " << &infoLog[0];
+            std::cerr << "shader compilation failed: " << &infoLog[0];
+        }
 
         glDeleteShader(shader);
         shader = 0;