Add an instancing perf test.

samples/multi_window/MultiWindow.cpp

@@ -14,6 +14,8 @@
 #include "random_utils.h"
 #include "shader_utils.h"
 
+using namespace angle;
+
 class MultiWindowSample : public SampleApplication
 {
   public:

samples/particle_system/ParticleSystem.cpp

@@ -23,6 +23,8 @@
 #define _USE_MATH_DEFINES
 #include <math.h>
 
+using namespace angle;
+
 class ParticleSystemSample : public SampleApplication
 {
   public:

samples/sample_util/SampleApplication.cpp

@@ -6,6 +6,7 @@
 
 #include "SampleApplication.h"
 #include "EGLWindow.h"
+#include "random_utils.h"
 
 SampleApplication::SampleApplication(const std::string &name,
                                      size_t width,
@@ -29,6 +30,8 @@ SampleApplication::SampleApplication(const std::string &name,
 
     // Disable vsync
     mEGLWindow->setSwapInterval(0);
+
+    angle::RandomInitFromTime();
 }
 
 SampleApplication::~SampleApplication()

src/tests/angle_perftests.gypi

@@ -21,6 +21,7 @@
             '<(angle_path)/src/tests/perf_tests/DrawCallPerf.cpp',
             '<(angle_path)/src/tests/perf_tests/EGLInitializePerf.cpp',
             '<(angle_path)/src/tests/perf_tests/IndexConversionPerf.cpp',
+            '<(angle_path)/src/tests/perf_tests/InstancingPerf.cpp',
             '<(angle_path)/src/tests/perf_tests/InterleavedAttributeData.cpp',
             '<(angle_path)/src/tests/perf_tests/PointSprites.cpp',
             '<(angle_path)/src/tests/perf_tests/TexSubImage.cpp',

util/random_utils.cpp

@@ -3,20 +3,35 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
+// random_utils:
+//   Helper functions for random number generation.
+//
 
 #include "random_utils.h"
 #include <time.h>
 #include <cstdlib>
 
+namespace angle
+{
+
+void RandomInitFromTime()
+{
+    srand(static_cast<unsigned int>(time(NULL)));
+}
+
+float RandomFloat()
+{
+    return static_cast<float>(rand()) / static_cast<float>(RAND_MAX);
+}
+
 float RandomBetween(float min, float max)
 {
-    static bool randInitialized = false;
-    if (!randInitialized)
-    {
-        srand(static_cast<unsigned int>(time(NULL)));
-        randInitialized = true;
-    }
+    return min + RandomFloat() * (max - min);
+}
 
-    const size_t divisor = 10000;
-    return min + ((rand() % divisor) / static_cast<float>(divisor)) * (max - min);
+float RandomNegativeOneToOne()
+{
+    return RandomBetween(0.0f, 1.0f);
 }
+
+}  // namespace angle

util/random_utils.h

@@ -3,10 +3,22 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
+// random_utils:
+//   Helper functions for random number generation.
+//
 
 #ifndef UTIL_RANDOM_UTILS_H
 #define UTIL_RANDOM_UTILS_H
 
+namespace angle
+{
+
+// TODO(jmadill): Should make this a class
+void RandomInitFromTime();
+float RandomFloat();
 float RandomBetween(float min, float max);
+float RandomNegativeOneToOne();
+
+}  // namespace angle
 
 #endif // UTIL_RANDOM_UTILS_H

util/shader_utils.cpp

@@ -46,10 +46,16 @@ GLuint CompileShader(GLenum type, const std::string &source)
         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;