commit 0d3683c4258e564b9605815c2d9d19b5e2d813e6
author Geoff Lang <geofflang@chromium.org> Thu Oct 23 11:08:16 2014 -0400
committer Geoff Lang <geofflang@chromium.org> Mon Nov 03 17:56:14 2014 +0000
tree 7f194e846bb6fc734eeab5478271ed833b832366
parent 6b0cf99612c571ad3e47e31fc44c2b21399038e3

Update ANGLE_platform_angle to allow requesting of Renderer versions.

Added enums to allow users to request major and minor versions of the
underlying API and if a WARP device is used.

BUG=angle:490

Change-Id: I0bfb2ac8d327da28a47cc8e6346300e47ab9538c
Reviewed-on: https://chromium-review.googlesource.com/225081
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>

tests/angle_tests/IndexedPointsTest.cpp

diff --git a/tests/angle_tests/IndexedPointsTest.cpp b/tests/angle_tests/IndexedPointsTest.cpp
index 1f86aa1..043ba28 100644
--- a/tests/angle_tests/IndexedPointsTest.cpp
+++ b/tests/angle_tests/IndexedPointsTest.cpp
@@ -1,11 +1,11 @@
 #include "ANGLETest.h"
 #include <array>
 
-template <typename IndexType, GLenum IndexTypeName>
+template <typename T, typename IndexType, GLenum IndexTypeName>
 class IndexedPointsTest : public ANGLETest
 {
 protected:
-    IndexedPointsTest() : ANGLETest(2, EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE)
+    IndexedPointsTest() : ANGLETest(T::GetGlesMajorVersion(), T::GetPlatform())
     {
         setWindowWidth(128);
         setWindowHeight(128);
@@ -123,7 +123,7 @@
     static const GLuint mPointCount = 4;
 };
 
-typedef IndexedPointsTest<GLubyte, GL_UNSIGNED_BYTE> IndexedPointsTestUByte;
+typedef IndexedPointsTest<ES2_D3D11, GLubyte, GL_UNSIGNED_BYTE> IndexedPointsTestUByte;
 
 TEST_F(IndexedPointsTestUByte, UnsignedByteOffset0)
 {
@@ -145,7 +145,7 @@
     runTest(3);
 }
 
-typedef IndexedPointsTest<GLushort, GL_UNSIGNED_SHORT> IndexedPointsTestUShort;
+typedef IndexedPointsTest<ES2_D3D11, GLushort, GL_UNSIGNED_SHORT> IndexedPointsTestUShort;
 
 TEST_F(IndexedPointsTestUShort, UnsignedShortOffset0)
 {
@@ -167,7 +167,7 @@
     runTest(3);
 }
 
-typedef IndexedPointsTest<GLuint, GL_UNSIGNED_INT> IndexedPointsTestUInt;
+typedef IndexedPointsTest<ES2_D3D11, GLuint, GL_UNSIGNED_INT> IndexedPointsTestUInt;
 
 TEST_F(IndexedPointsTestUInt, UnsignedIntOffset0)
 {