Merge branch 'ANGLE-rollback'

This resolves #624

Note: Cherry-picked some fixes on top of the ANGLE version that we want to keep.

1 files changed, 1 insertions, 8 deletions

diff --git a/gfx/angle/src/libANGLE/TransformFeedback_unittest.cpp b/gfx/angle/src/libANGLE/TransformFeedback_unittest.cpp
index aa464d105..07a0959e2 100755
--- a/gfx/angle/src/libANGLE/TransformFeedback_unittest.cpp
+++ b/gfx/angle/src/libANGLE/TransformFeedback_unittest.cpp
@@ -101,16 +101,9 @@ TEST_F(TransformFeedbackTest, SideEffectsOfPauseAndResume)
 TEST_F(TransformFeedbackTest, BufferBinding)
 {
     rx::MockBufferImpl *bufferImpl = new rx::MockBufferImpl;
+    gl::Buffer *buffer = new gl::Buffer(bufferImpl, 1);
     EXPECT_CALL(*bufferImpl, destructor()).Times(1).RetiresOnSaturation();
 
-    rx::MockGLFactory mockGLFactory;
-    EXPECT_CALL(mockGLFactory, createBuffer(_))
-        .Times(1)
-        .WillOnce(Return(bufferImpl))
-        .RetiresOnSaturation();
-
-    gl::Buffer *buffer = new gl::Buffer(&mockGLFactory, 1);
-
     static const size_t bindIndex = 0;
 
     EXPECT_EQ(mFeedback->getIndexedBufferCount(), mCaps.maxTransformFeedbackSeparateAttributes);