1 files changed, 18 insertions, 9 deletions
diff --git a/src/3rdparty/angle/src/libANGLE/renderer/ProgramImpl_mock.h b/src/3rdparty/angle/src/libANGLE/renderer/ProgramImpl_mock.h
index d6aa238f64..4717ab8843 100644
--- a/src/3rdparty/angle/src/libANGLE/renderer/ProgramImpl_mock.h
+++ b/src/3rdparty/angle/src/libANGLE/renderer/ProgramImpl_mock.h
@@ -12,6 +12,7 @@
 
 #include "gmock/gmock.h"
 
+#include "libANGLE/ProgramLinkedResources.h"
 #include "libANGLE/renderer/ProgramImpl.h"
 
 namespace rx
@@ -20,14 +21,18 @@ namespace rx
 class MockProgramImpl : public rx::ProgramImpl
 {
   public:
-    MockProgramImpl() : ProgramImpl(gl::Program::Data()) {}
-    virtual ~MockProgramImpl() { destroy(); }
+    MockProgramImpl() : ProgramImpl(gl::ProgramState()) {}
+    virtual ~MockProgramImpl() { destructor(); }
 
-    MOCK_METHOD2(load, LinkResult(gl::InfoLog &, gl::BinaryInputStream *));
-    MOCK_METHOD1(save, gl::Error(gl::BinaryOutputStream *));
+    MOCK_METHOD3(load, gl::LinkResult(const gl::Context *, gl::InfoLog &, gl::BinaryInputStream *));
+    MOCK_METHOD2(save, void(const gl::Context *, gl::BinaryOutputStream *));
     MOCK_METHOD1(setBinaryRetrievableHint, void(bool));
+    MOCK_METHOD1(setSeparable, void(bool));
 
-    MOCK_METHOD2(link, LinkResult(const gl::Data &, gl::InfoLog &));
+    MOCK_METHOD3(link,
+                 gl::LinkResult(const gl::Context *,
+                                const gl::ProgramLinkedResources &,
+                                gl::InfoLog &));
     MOCK_METHOD2(validate, GLboolean(const gl::Caps &, gl::InfoLog *));
 
     MOCK_METHOD3(setUniform1fv, void(GLint, GLsizei, const GLfloat *));
@@ -53,11 +58,15 @@ class MockProgramImpl : public rx::ProgramImpl
     MOCK_METHOD4(setUniformMatrix3x4fv, void(GLint, GLsizei, GLboolean, const GLfloat *));
     MOCK_METHOD4(setUniformMatrix4x3fv, void(GLint, GLsizei, GLboolean, const GLfloat *));
 
+    MOCK_CONST_METHOD3(getUniformfv, void(const gl::Context *, GLint, GLfloat *));
+    MOCK_CONST_METHOD3(getUniformiv, void(const gl::Context *, GLint, GLint *));
+    MOCK_CONST_METHOD3(getUniformuiv, void(const gl::Context *, GLint, GLuint *));
+
     MOCK_METHOD2(setUniformBlockBinding, void(GLuint, GLuint));
-    MOCK_CONST_METHOD2(getUniformBlockSize, bool(const std::string &, size_t *));
-    MOCK_CONST_METHOD2(getUniformBlockMemberInfo, bool(const std::string &, sh::BlockMemberInfo *));
+    MOCK_METHOD4(setPathFragmentInputGen,
+                 void(const std::string &, GLenum, GLint, const GLfloat *));
 
-    MOCK_METHOD0(destroy, void());
+    MOCK_METHOD0(destructor, void());
 };
 
 inline ::testing::NiceMock<MockProgramImpl> *MakeProgramMock()
@@ -65,7 +74,7 @@ inline ::testing::NiceMock<MockProgramImpl> *MakeProgramMock()
     ::testing::NiceMock<MockProgramImpl> *programImpl = new ::testing::NiceMock<MockProgramImpl>();
     // TODO(jmadill): add ON_CALLS for returning methods
     // We must mock the destructor since NiceMock doesn't work for destructors.
-    EXPECT_CALL(*programImpl, destroy()).Times(1).RetiresOnSaturation();
+    EXPECT_CALL(*programImpl, destructor()).Times(1).RetiresOnSaturation();
 
     return programImpl;
 }