Merge commit 'dev' into 'wip/cmake-merge'

Change-Id: I176c40d031be26a1dd1cf08843e448a660598783

1 files changed, 21 insertions, 11 deletions

diff --git a/src/3rdparty/angle/src/libANGLE/renderer/BufferImpl_mock.h b/src/3rdparty/angle/src/libANGLE/renderer/BufferImpl_mock.h
index a6387661ce..5a4e21003c 100644
--- a/src/3rdparty/angle/src/libANGLE/renderer/BufferImpl_mock.h
+++ b/src/3rdparty/angle/src/libANGLE/renderer/BufferImpl_mock.h
@@ -11,28 +11,38 @@
 
 #include "gmock/gmock.h"
 
+#include "libANGLE/Buffer.h"
 #include "libANGLE/renderer/BufferImpl.h"
 
 namespace rx
 {
-
 class MockBufferImpl : public BufferImpl
 {
   public:
+    MockBufferImpl() : BufferImpl(mMockState) {}
     ~MockBufferImpl() { destructor(); }
 
-    MOCK_METHOD3(setData, gl::Error(const void*, size_t, GLenum));
-    MOCK_METHOD3(setSubData, gl::Error(const void*, size_t, size_t));
-    MOCK_METHOD4(copySubData, gl::Error(BufferImpl *, GLintptr, GLintptr, GLsizeiptr));
-    MOCK_METHOD2(map, gl::Error(GLenum, GLvoid **));
-    MOCK_METHOD4(mapRange, gl::Error(size_t, size_t, GLbitfield, GLvoid **));
-    MOCK_METHOD1(unmap, gl::Error(GLboolean *result));
-
-    MOCK_METHOD5(getIndexRange, gl::Error(GLenum, size_t, size_t, bool, gl::IndexRange *));
+    MOCK_METHOD5(
+        setData,
+        gl::Error(const gl::Context *, gl::BufferBinding, const void *, size_t, gl::BufferUsage));
+    MOCK_METHOD5(setSubData,
+                 gl::Error(const gl::Context *, gl::BufferBinding, const void *, size_t, size_t));
+    MOCK_METHOD5(
+        copySubData,
+        gl::Error(const gl::Context *contextImpl, BufferImpl *, GLintptr, GLintptr, GLsizeiptr));
+    MOCK_METHOD3(map, gl::Error(const gl::Context *contextImpl, GLenum, void **));
+    MOCK_METHOD5(mapRange,
+                 gl::Error(const gl::Context *contextImpl, size_t, size_t, GLbitfield, void **));
+    MOCK_METHOD2(unmap, gl::Error(const gl::Context *contextImpl, GLboolean *result));
+
+    MOCK_METHOD6(getIndexRange,
+                 gl::Error(const gl::Context *, GLenum, size_t, size_t, bool, gl::IndexRange *));
 
     MOCK_METHOD0(destructor, void());
-};
 
+  protected:
+    gl::BufferState mMockState;
+};
 }
 
-#endif // LIBANGLE_RENDERER_BUFFERIMPLMOCK_H_
+#endif  // LIBANGLE_RENDERER_BUFFERIMPLMOCK_H_