commit eb66a6e21e66e2884888382c1890f146ef4cbd90
author Geoff Lang <geofflang@chromium.org> Mon Oct 31 13:06:12 2016 -0400
committer Commit Bot <commit-bot@chromium.org> Tue Nov 01 19:30:39 2016 +0000
tree 0777cca485696bc6e92c6efe6200357412bcbf6a
parent cfe7b2c43e0c1bc4fd531a6d7f99fb7f2139a078

Replace the GLVersion class with gl::Version.

Update code to use gl::Version in as many places as possible to ease ES 3.1
support.

BUG=angleproject:1588

Change-Id: I3490b53a81027cf849dac551a9cc66ce04506144
Reviewed-on: https://chromium-review.googlesource.com/404946
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Geoff Lang <geofflang@chromium.org>

src/libANGLE/validationES_unittest.cpp

diff --git a/src/libANGLE/validationES_unittest.cpp b/src/libANGLE/validationES_unittest.cpp
index c018924..3cb5311 100644
--- a/src/libANGLE/validationES_unittest.cpp
+++ b/src/libANGLE/validationES_unittest.cpp
@@ -29,8 +29,7 @@
 class MockValidationContext : public ValidationContext
 {
   public:
-    MockValidationContext(GLint majorClientVersion,
-                          GLint minorClientVersion,
+    MockValidationContext(const Version &version,
                           State *state,
                           const Caps &caps,
                           const TextureCapsMap &textureCaps,
@@ -42,8 +41,7 @@
     MOCK_METHOD1(handleError, void(const Error &));
 };
 
-MockValidationContext::MockValidationContext(GLint majorClientVersion,
-                                             GLint minorClientVersion,
+MockValidationContext::MockValidationContext(const Version &version,
                                              State *state,
                                              const Caps &caps,
                                              const TextureCapsMap &textureCaps,
@@ -51,8 +49,7 @@
                                              const ResourceManager *resourceManager,
                                              const Limitations &limitations,
                                              bool skipValidation)
-    : ValidationContext(majorClientVersion,
-                        minorClientVersion,
+    : ValidationContext(version,
                         state,
                         caps,
                         textureCaps,
@@ -87,7 +84,7 @@
     caps.maxElementIndex     = 100;
     caps.maxDrawBuffers      = 1;
     caps.maxColorAttachments = 1;
-    state.initialize(caps, extensions, 3, false, true);
+    state.initialize(caps, extensions, Version(3, 0), false, true);
 
     NiceMock<MockTextureImpl> *textureImpl = new NiceMock<MockTextureImpl>();
     EXPECT_CALL(mockFactory, createTexture(_)).WillOnce(Return(textureImpl));
@@ -108,8 +105,8 @@
     state.setDrawFramebufferBinding(framebuffer);
     state.setProgram(program);
 
-    NiceMock<MockValidationContext> testContext(3, 0, &state, caps, textureCaps, extensions,
-                                                nullptr, limitations, false);
+    NiceMock<MockValidationContext> testContext(Version(3, 0), &state, caps, textureCaps,
+                                                extensions, nullptr, limitations, false);
 
     // Set the expectation for the validation error here.
     Error expectedError(GL_INVALID_OPERATION, g_ExceedsMaxElementErrorMessage);