Improve indexed gl state related GL commands.

gpu/command_buffer/service/context_state.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "gpu/command_buffer/service/context_state.h"
 
 #include <stddef.h>
 
 #include <cmath>
 
@@ skipping 297 matching lines @@
       glPauseTransformFeedback();
     }
   }
   if (bound_transform_feedback.get()) {
     bound_transform_feedback->DoBindTransformFeedback(GL_TRANSFORM_FEEDBACK);
   } else {
     glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, 0);
   }
 }
 
+void ContextState::RestoreIndexedUniformBufferBindings(
+    const ContextState* prev_state) {
+  if (!feature_info_->IsES3Capable())
+    return;
+  indexed_uniform_buffer_bindings->RestoreBindings(
+      prev_state ? prev_state->indexed_uniform_buffer_bindings.get() : nullptr);
+}
+
 void ContextState::RestoreActiveTexture() const {
   glActiveTexture(GL_TEXTURE0 + active_texture_unit);
 }
 
 void ContextState::RestoreAllTextureUnitBindings(
     const ContextState* prev_state) const {
   // Restore Texture state.
   for (size_t ii = 0; ii < texture_units.size(); ++ii) {
     RestoreTextureUnitBindings(ii, prev_state);
   }
@@ skipping 114 matching lines @@
   InitState(prev_state);
 }
 
 void ContextState::RestoreState(const ContextState* prev_state) {
   RestoreAllTextureUnitBindings(prev_state);
   RestoreVertexAttribs();
   RestoreBufferBindings();
   RestoreRenderbufferBindings();
   RestoreProgramBindings();
   RestoreTransformFeedbackBindings(prev_state);
+  RestoreIndexedUniformBufferBindings(prev_state);
   RestoreGlobalState(prev_state);
 }
 
 ErrorState* ContextState::GetErrorState() {
   return error_state_.get();
 }
 
 void ContextState::EnableDisable(GLenum pname, bool enable) const {
   if (pname == GL_PRIMITIVE_RESTART_FIXED_INDEX &&
       feature_info_->feature_flags().emulate_primitive_restart_fixed_index) {
@@ skipping 184 matching lines @@
   UpdateUnpackParameters();
 }
 
 // Include the auto-generated part of this file. We split this because it means
 // we can easily edit the non-auto generated parts right here in this file
 // instead of having to edit some template or the code generator.
 #include "gpu/command_buffer/service/context_state_impl_autogen.h"
 
 }  // namespace gles2
 }  // namespace gpu