Roll back to ANGLE/2845

1 files changed, 9 insertions, 11 deletions

diff --git a/gfx/angle/src/libANGLE/validationES_unittest.cpp b/gfx/angle/src/libANGLE/validationES_unittest.cpp
index 925005a6e..9d99c32a8 100755
--- a/gfx/angle/src/libANGLE/validationES_unittest.cpp
+++ b/gfx/angle/src/libANGLE/validationES_unittest.cpp
@@ -29,36 +29,36 @@ namespace
 class MockValidationContext : public ValidationContext
 {
   public:
-    MockValidationContext(const Version &version,
+    MockValidationContext(GLint majorClientVersion,
+                          GLint minorClientVersion,
                           State *state,
                           const Caps &caps,
                           const TextureCapsMap &textureCaps,
                           const Extensions &extensions,
                           const ResourceManager *resourceManager,
                           const Limitations &limitations,
-                          const ResourceMap<Framebuffer> &framebufferMap,
                           bool skipValidation);
 
     MOCK_METHOD1(handleError, void(const Error &));
 };
 
-MockValidationContext::MockValidationContext(const Version &version,
+MockValidationContext::MockValidationContext(GLint majorClientVersion,
+                                             GLint minorClientVersion,
                                              State *state,
                                              const Caps &caps,
                                              const TextureCapsMap &textureCaps,
                                              const Extensions &extensions,
                                              const ResourceManager *resourceManager,
                                              const Limitations &limitations,
-                                             const ResourceMap<Framebuffer> &framebufferMap,
                                              bool skipValidation)
-    : ValidationContext(version,
+    : ValidationContext(majorClientVersion,
+                        minorClientVersion,
                         state,
                         caps,
                         textureCaps,
                         extensions,
                         resourceManager,
                         limitations,
-                        framebufferMap,
                         skipValidation)
 {
 }
@@ -82,13 +82,12 @@ TEST(ValidationESTest, DrawElementsWithMaxIndexGivesError)
     TextureCapsMap textureCaps;
     Extensions extensions;
     Limitations limitations;
-    ResourceMap<Framebuffer> framebufferMap;
 
     // Set some basic caps.
     caps.maxElementIndex     = 100;
     caps.maxDrawBuffers      = 1;
     caps.maxColorAttachments = 1;
-    state.initialize(caps, extensions, Version(3, 0), false, true);
+    state.initialize(caps, extensions, 3, false);
 
     NiceMock<MockTextureImpl> *textureImpl = new NiceMock<MockTextureImpl>();
     EXPECT_CALL(mockFactory, createTexture(_)).WillOnce(Return(textureImpl));
@@ -109,9 +108,8 @@ TEST(ValidationESTest, DrawElementsWithMaxIndexGivesError)
     state.setDrawFramebufferBinding(framebuffer);
     state.setProgram(program);
 
-    NiceMock<MockValidationContext> testContext(Version(3, 0), &state, caps, textureCaps,
-                                                extensions, nullptr, limitations, framebufferMap,
-                                                false);
+    NiceMock<MockValidationContext> testContext(3, 0, &state, caps, textureCaps, extensions,
+                                                nullptr, limitations, false);
 
     // Set the expectation for the validation error here.
     Error expectedError(GL_INVALID_OPERATION, g_ExceedsMaxElementErrorMessage);