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/ProgramBinaryTest.cpp

diff --git a/tests/angle_tests/ProgramBinaryTest.cpp b/tests/angle_tests/ProgramBinaryTest.cpp
index 4f7b4f9..6a48b35 100644
--- a/tests/angle_tests/ProgramBinaryTest.cpp
+++ b/tests/angle_tests/ProgramBinaryTest.cpp
@@ -3,14 +3,13 @@
 #include <stdint.h>
 
 // Use this to select which configurations (e.g. which renderer, which GLES major version) these tests should be run against.
-typedef ::testing::Types<TFT<Gles::Two, Rend::D3D11>, TFT<Gles::Two, Rend::D3D9>> TestFixtureTypes;
-TYPED_TEST_CASE(ProgramBinaryTest, TestFixtureTypes);
+ANGLE_TYPED_TEST_CASE(ProgramBinaryTest, ES2_D3D9, ES2_D3D11);
 
 template<typename T>
 class ProgramBinaryTest : public ANGLETest
 {
-protected:
-    ProgramBinaryTest() : ANGLETest(T::GetGlesMajorVersion(), T::GetRequestedRenderer())
+  protected:
+    ProgramBinaryTest() : ANGLETest(T::GetGlesMajorVersion(), T::GetPlatform())
     {
         setWindowWidth(128);
         setWindowHeight(128);