Capture/Replay: Capture glBindBufferBase during MEC setup

src/libANGLE/FrameCapture.cpp

@@ -2228,6 +2228,33 @@ void CaptureBufferBindingResetCalls(const gl::State &replayState,
     Capture(&bufferBindingCalls, CaptureBindBuffer(replayState, true, binding, id));
 }
 
+void CaptureBindIndexedBuffer(const gl::State &glState,
+                              gl::BufferBinding binding,
+                              const gl::BufferVector &indexedBuffers,
+                              const gl::BufferID bufferID,
+                              std::vector<CallCapture> *setupCalls)
+{
+    for (unsigned int index = 0; index < indexedBuffers.size(); ++index)
+    {
+        if (bufferID.value == indexedBuffers[index].id().value)
+        {
+            GLintptr offset = indexedBuffers[index].getOffset();
+            GLsizeiptr size = indexedBuffers[index].getSize();
+
+            // Context::bindBufferBase() calls Context::bindBufferRange() with size and offset = 0.
+            if ((offset == 0) && (size == 0))
+            {
+                Capture(setupCalls, CaptureBindBufferBase(glState, true, binding, index, bufferID));
+            }
+            else
+            {
+                Capture(setupCalls, CaptureBindBufferRange(glState, true, binding, index, bufferID,
+                                                           offset, size));
+            }
+        }
+    }
+}
+
 void CaptureMidExecutionSetup(const gl::Context *context,
                               std::vector<CallCapture> *setupCalls,
                               ResourceTracker *resourceTracker,
@@ -2245,9 +2272,7 @@ void CaptureMidExecutionSetup(const gl::Context *context,
     // TODO(jmadill): Use handle mapping for captured objects. http://anglebug.com/3662
 
     // Capture Buffer data.
-    const gl::BufferManager &buffers       = apiState.getBufferManagerForCapture();
-    const gl::BoundBufferMap &boundBuffers = apiState.getBoundBuffersForCapture();
-
+    const gl::BufferManager &buffers = apiState.getBufferManagerForCapture();
     for (const auto &bufferIter : buffers)
     {
         gl::BufferID id    = {bufferIter.first};
@@ -2374,6 +2399,13 @@ void CaptureMidExecutionSetup(const gl::Context *context,
     }
 
     // Capture Buffer bindings.
+    const gl::BufferVector &uniformIndexedBuffers =
+        apiState.getOffsetBindingPointerUniformBuffers();
+    const gl::BufferVector &atomicCounterIndexedBuffers =
+        apiState.getOffsetBindingPointerAtomicCounterBuffers();
+    const gl::BufferVector &shaderStorageIndexedBuffers =
+        apiState.getOffsetBindingPointerShaderStorageBuffers();
+    const gl::BoundBufferMap &boundBuffers = apiState.getBoundBuffersForCapture();
     for (gl::BufferBinding binding : angle::AllEnums<gl::BufferBinding>())
     {
         gl::BufferID bufferID = boundBuffers[binding].id();
@@ -2387,6 +2419,32 @@ void CaptureMidExecutionSetup(const gl::Context *context,
             (!isArray && bufferID.value != 0))
         {
             cap(CaptureBindBuffer(replayState, true, binding, bufferID));
+
+            // Only the following buffer targets can be indexed:
+            // - GL_TRANSFORM_FEEDBACK_BUFFER
+            //   - Transform feedback is handled separately, since transform feedback buffers are
+            //   owned by the transform feedback object.
+            // - GL_UNIFORM_BUFFER
+            // - GL_ATOMIC_COUNTER_BUFFER
+            // - GL_SHADER_STORAGE_BUFFER
+            // Ignore all other binding types.
+            switch (binding)
+            {
+                case gl::BufferBinding::Uniform:
+                    CaptureBindIndexedBuffer(replayState, binding, uniformIndexedBuffers, bufferID,
+                                             setupCalls);
+                    break;
+                case gl::BufferBinding::AtomicCounter:
+                    CaptureBindIndexedBuffer(replayState, binding, atomicCounterIndexedBuffers,
+                                             bufferID, setupCalls);
+                    break;
+                case gl::BufferBinding::ShaderStorage:
+                    CaptureBindIndexedBuffer(replayState, binding, shaderStorageIndexedBuffers,
+                                             bufferID, setupCalls);
+                    break;
+                default:
+                    break;
+            }
         }
 
         // Restore all buffer bindings for Reset