During virtual context switches only restore texture units that have changed from the previous cont…

gpu/command_buffer/service/context_state.h

 // 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.
 
 // This file contains the ContextState class.
 
 #ifndef GPU_COMMAND_BUFFER_SERVICE_CONTEXT_STATE_H_
 #define GPU_COMMAND_BUFFER_SERVICE_CONTEXT_STATE_H_
 
 #include <vector>
@@ skipping 80 matching lines @@
   }
   float v[4];
 };
 
 struct GPU_EXPORT ContextState {
   ContextState(FeatureInfo* feature_info, Logger* logger);
   ~ContextState();
 
   void Initialize();
 
-  void RestoreState() const;
+  void RestoreState(const ContextState* prev_state) const;
   void InitCapabilities() const;
   void InitState() const;
 
   void RestoreActiveTexture() const;
-  void RestoreAllTextureUnitBindings() const;
+  void RestoreAllTextureUnitBindings(const ContextState* prev_state) const;
   void RestoreAttribute(GLuint index) const;
   void RestoreBufferBindings() const;
   void RestoreGlobalState() const;
   void RestoreProgramBindings() const;
   void RestoreRenderbufferBindings() const;
-  void RestoreTextureUnitBindings(GLuint unit) const;
+  void RestoreTextureUnitBindings(
+      GLuint unit, const ContextState* prev_state) const;
 
   // Helper for getting cached state.
   bool GetStateAsGLint(
       GLenum pname, GLint* params, GLsizei* num_written) const;
   bool GetStateAsGLfloat(
       GLenum pname, GLfloat* params, GLsizei* num_written) const;
   bool GetEnabled(GLenum cap) const;
 
   ErrorState* GetErrorState();
 
@@ skipping 34 matching lines @@
 
  private:
   scoped_ptr<ErrorState> error_state_;
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_CONTEXT_STATE_H_