commit b8d2664fe9effff309c1053da9b79511e6f1fe4f
author Yuly Novikov <ynovikov@chromium.org> Fri Oct 27 18:14:14 2017 -0400
committer Commit Bot <commit-bot@chromium.org> Thu Nov 02 02:30:47 2017 +0000
tree 6328ac3c9a88a6f6bc64b301454e5c8b251fd0f5
parent 526543cb0065819701b604d7b1253c6a6334cc8a

Run angle_perftests on GLES backend

Adds OPENGLES_NULL configuration
and selects between OPENGL and OPENGLES based on whether building for Android.

Also 2 small changes to get the newly enabled tests to pass on N5X:
1. Require GL_EXT_texture_storage in TexSubImage test
2. Limit numVertexUniforms and numFragmentUniforms to 64 in MatrixUniforms test

BUG=675997
Change-Id: I5439e5fb7e93b3a928f12594761115d56f60d81b
Reviewed-on: https://chromium-review.googlesource.com/748522
Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>

src/tests/perf_tests/LinkProgramPerfTest.cpp

diff --git a/src/tests/perf_tests/LinkProgramPerfTest.cpp b/src/tests/perf_tests/LinkProgramPerfTest.cpp
index 5a6ebcc..0fa0f01 100644
--- a/src/tests/perf_tests/LinkProgramPerfTest.cpp
+++ b/src/tests/perf_tests/LinkProgramPerfTest.cpp
@@ -128,10 +128,10 @@
     return params;
 }
 
-LinkProgramParams LinkProgramOpenGLParams()
+LinkProgramParams LinkProgramOpenGLOrGLESParams()
 {
     LinkProgramParams params;
-    params.eglParameters = OPENGL();
+    params.eglParameters = OPENGL_OR_GLES(false);
     return params;
 }
 
@@ -143,6 +143,6 @@
 ANGLE_INSTANTIATE_TEST(LinkProgramBenchmark,
                        LinkProgramD3D11Params(),
                        LinkProgramD3D9Params(),
-                       LinkProgramOpenGLParams());
+                       LinkProgramOpenGLOrGLESParams());
 
 }  // anonymous namespace