diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-07-11 23:29:50 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-07-11 23:31:02 +0200 |
| commit | 70dd5e7c66b1fe3f82e5b4db2406050baba15f05 (patch) | |
| tree | 3f012200ef3c934f33db1a4ef2b790fae3141860 /gfx/angle/src/tests/angle_unittests_utils.h | |
| parent | 3b7ffb477eec078c7036c92c6a51bb5de6de4f28 (diff) | |
| parent | 8481fa25d246f1968d0a254ee3c6cdd82c60781a (diff) | |
| download | UXP-70dd5e7c66b1fe3f82e5b4db2406050baba15f05.tar UXP-70dd5e7c66b1fe3f82e5b4db2406050baba15f05.tar.gz UXP-70dd5e7c66b1fe3f82e5b4db2406050baba15f05.tar.lz UXP-70dd5e7c66b1fe3f82e5b4db2406050baba15f05.tar.xz UXP-70dd5e7c66b1fe3f82e5b4db2406050baba15f05.zip | |
Merge branch 'ANGLE-rollback'
This resolves #624
Note: Cherry-picked some fixes on top of the ANGLE version that we want to keep.
Diffstat (limited to 'gfx/angle/src/tests/angle_unittests_utils.h')
| -rwxr-xr-x | gfx/angle/src/tests/angle_unittests_utils.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/gfx/angle/src/tests/angle_unittests_utils.h b/gfx/angle/src/tests/angle_unittests_utils.h index 790d3455d..487c1685c 100755 --- a/gfx/angle/src/tests/angle_unittests_utils.h +++ b/gfx/angle/src/tests/angle_unittests_utils.h @@ -41,7 +41,7 @@ class NullFactory : public GLImplFactory RenderbufferImpl *createRenderbuffer() override { return nullptr; } // Buffer creation - BufferImpl *createBuffer(const gl::BufferState &state) override { return nullptr; } + BufferImpl *createBuffer() override { return nullptr; } // Vertex Array creation VertexArrayImpl *createVertexArray(const gl::VertexArrayState &data) override @@ -80,7 +80,7 @@ class MockGLFactory : public GLImplFactory MOCK_METHOD1(createFramebuffer, FramebufferImpl *(const gl::FramebufferState &)); MOCK_METHOD1(createTexture, TextureImpl *(const gl::TextureState &)); MOCK_METHOD0(createRenderbuffer, RenderbufferImpl *()); - MOCK_METHOD1(createBuffer, BufferImpl *(const gl::BufferState &)); + MOCK_METHOD0(createBuffer, BufferImpl *()); MOCK_METHOD1(createVertexArray, VertexArrayImpl *(const gl::VertexArrayState &)); MOCK_METHOD1(createQuery, QueryImpl *(GLenum type)); MOCK_METHOD0(createFenceNV, FenceNVImpl *()); @@ -103,10 +103,9 @@ class MockEGLFactory : public EGLImplFactory SurfaceImpl *(const egl::SurfaceState &, const egl::Config *, const egl::AttributeMap &)); - MOCK_METHOD5(createPbufferFromClientBuffer, + MOCK_METHOD4(createPbufferFromClientBuffer, SurfaceImpl *(const egl::SurfaceState &, const egl::Config *, - EGLenum, EGLClientBuffer, const egl::AttributeMap &)); MOCK_METHOD4(createPixmapSurface, |