commit 90c253a6168360d0ed96502935737c93790df6ae
author Jamie Madill <jmadill@chromium.org> Tue Dec 15 15:14:08 2015 -0500
committer Jamie Madill <jmadill@chromium.org> Wed Dec 16 14:04:14 2015 +0000
tree 1d39bb1db6a245dc79b1871dc45e79b5d6ffe7ed
parent 3215b207b29688c4df76a7edc40c1f62a4238c99

Add an instancing perf test.

BUG=526217
BUG=angleproject:1164

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

util/shader_utils.cpp

diff --git a/util/shader_utils.cpp b/util/shader_utils.cpp
index 33f8bc6..150d067 100644
--- a/util/shader_utils.cpp
+++ b/util/shader_utils.cpp
@@ -46,10 +46,16 @@
         GLint infoLogLength;
         glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &infoLogLength);
 
-        std::vector<GLchar> infoLog(infoLogLength);
-        glGetShaderInfoLog(shader, static_cast<GLsizei>(infoLog.size()), NULL, &infoLog[0]);
-
-        std::cerr << "shader compilation failed: " << &infoLog[0];
+        if (infoLogLength > 0)
+        {
+            std::vector<GLchar> infoLog(infoLogLength);
+            glGetShaderInfoLog(shader, static_cast<GLsizei>(infoLog.size()), NULL, &infoLog[0]);
+            std::cerr << "shader compilation failed: " << &infoLog[0];
+        }
+        else
+        {
+            std::cerr << "shader compilation failed. <Empty log message>";
+        }
 
         glDeleteShader(shader);
         shader = 0;