Fixes to the Uniforms Perf benchmark.

Fix the REPEAT test, and add a D3D11 and OpenGL null test. BUG=angleproject:1390 Change-Id: I491cbc9f9201ef85aeb9f70138a276078220b26d Reviewed-on: https://chromium-review.googlesource.com/623928Reviewed-by: Geoff Lang <geofflang@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>

Fixes to the Uniforms Perf benchmark.
335d67b8 · Jamie Madill · Commit Bot · 2c1183bb · 335d67b8
Commit 335d67b8 authored Aug 24, 2017 by Jamie Madill Committed by Commit Bot Aug 24, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 5 deletions

UniformsPerf.cpp src/tests/perf_tests/UniformsPerf.cpp +10 -5

No files found.
--- a/src/tests/perf_tests/UniformsPerf.cpp
+++ b/src/tests/perf_tests/UniformsPerf.cpp
@@ -79,6 +79,11 @@ std::string UniformsParams::suffix() const
    strstr << RenderTestParams::suffix();
+    if (eglParameters.deviceType == EGL_PLATFORM_ANGLE_DEVICE_TYPE_NULL_ANGLE)
+    {
+        strstr << "_null";
+    }
    if (dataType == DataType::VEC4)
    {
        strstr << "_" << (numVertexUniforms + numFragmentUniforms) << "_vec4";
@@ -324,7 +329,7 @@ void UniformsBenchmark::drawLoop(const SetUniformFunc &setUniformsFunc)
        {
            glUseProgram(mPrograms[frameIndex]);
        }
-        else
+        if (params.dataMode == DataMode::UPDATE)
        {
            for (size_t uniform = 0; uniform < mUniformLocations.size(); ++uniform)
            {
@@ -408,10 +413,10 @@ ANGLE_INSTANTIATE_TEST(UniformsBenchmark,
                       VectorUniforms(D3D9(), DataMode::UPDATE),
                       VectorUniforms(D3D11(), DataMode::REPEAT),
                       VectorUniforms(D3D11(), DataMode::UPDATE),
-                       VectorUniforms(OPENGL(), DataMode::REPEAT),
+                       VectorUniforms(D3D11_NULL(), DataMode::UPDATE),
                       VectorUniforms(OPENGL(), DataMode::UPDATE),
-                       MatrixUniforms(D3D11(), DataMode::REPEAT),
+                       VectorUniforms(OPENGL(), DataMode::REPEAT),
+                       VectorUniforms(OPENGL_NULL(), DataMode::UPDATE),
                       MatrixUniforms(D3D11(), DataMode::UPDATE),
-                       MatrixUniforms(OPENGL(), DataMode::REPEAT),
                       MatrixUniforms(OPENGL(), DataMode::UPDATE),
-                       VectorUniforms(D3D11_NULL(), DataMode::UPDATE, ProgramMode::MULTIPLE));
+                       VectorUniforms(D3D11_NULL(), DataMode::REPEAT, ProgramMode::MULTIPLE));