commit 335101071a3f4b5ef218b70f11210066d715ba80
author Jamie Madill <jmadill@chromium.org> Wed Sep 20 10:39:18 2017 -0400
committer Commit Bot <commit-bot@chromium.org> Wed Sep 20 16:23:19 2017 +0000
tree ecd7915ad2451318cc47d1eb0c126bdc431f831b
parent 4cc89e2bfecaca32508ca724462cf5421e74f14c

Pass gl::Context to more Buffer methods.

This will allow us to pull out the Renderer from the Context in more
places in Buffer11, for state update. Impacts a few method calls in
a few places.

BUG=angleproject:2151

Change-Id: I1360caea65a94d3de4cd9f52d1b74b10439b02b3
Reviewed-on: https://chromium-review.googlesource.com/673136
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Frank Henigman <fjhenigman@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>

src/tests/perf_tests/IndexDataManagerTest.cpp

diff --git a/src/tests/perf_tests/IndexDataManagerTest.cpp b/src/tests/perf_tests/IndexDataManagerTest.cpp
index 0e9cdf6..bd105d7 100644
--- a/src/tests/perf_tests/IndexDataManagerTest.cpp
+++ b/src/tests/perf_tests/IndexDataManagerTest.cpp
@@ -100,13 +100,13 @@
     MOCK_METHOD2(unmap, gl::Error(const gl::Context *context, GLboolean *));
 
     // BufferD3D
-    MOCK_METHOD0(markTransformFeedbackUsage, gl::Error());
+    MOCK_METHOD1(markTransformFeedbackUsage, gl::Error(const gl::Context *));
 
     // inlined for speed
     bool supportsDirectBinding() const override { return false; }
     size_t getSize() const override { return mData.size(); }
 
-    gl::Error getData(const uint8_t **outData) override
+    gl::Error getData(const gl::Context *context, const uint8_t **outData) override
     {
         *outData = &mData[0];
         return gl::NoError();
@@ -129,7 +129,7 @@
         EXPECT_CALL(*mBufferFactory, createVertexBuffer())
             .WillOnce(Return(nullptr))
             .RetiresOnSaturation();
-        mockBufferD3D->initializeStaticData();
+        mockBufferD3D->initializeStaticData(nullptr);
 
         return mockBufferD3D;
     }
@@ -177,10 +177,11 @@
     rx::TranslatedIndexData translatedIndexData;
     for (unsigned int iteration = 0; iteration < 100; ++iteration)
     {
-        (void)mIndexBuffer.getIndexRange(GL_UNSIGNED_SHORT, 0, mIndexCount, false,
+        (void)mIndexBuffer.getIndexRange(nullptr, GL_UNSIGNED_SHORT, 0, mIndexCount, false,
                                          &translatedIndexData.indexRange);
-        (void)mIndexDataManager.prepareIndexData(GL_UNSIGNED_SHORT, mIndexCount, &mIndexBuffer,
-                                                 nullptr, &translatedIndexData, false);
+        (void)mIndexDataManager.prepareIndexData(nullptr, GL_UNSIGNED_SHORT, mIndexCount,
+                                                 &mIndexBuffer, nullptr, &translatedIndexData,
+                                                 false);
     }
 }