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;
 
   // Helper for getting cached state.
   bool GetStateAsGLint(
       GLenum pname, GLint* params, GLsizei* num_written) const;
@@ skipping 31 matching lines @@
   // The currently bound renderbuffer
   scoped_refptr<Renderbuffer> bound_renderbuffer;
 
   scoped_refptr<QueryManager::Query> current_query;
 
   bool pack_reverse_row_order;
 
   mutable bool fbo_binding_for_scissor_workaround_dirty_;
   FeatureInfo* feature_info_;
 
+  // Maximum active texture unit index in this context.
+  GLuint max_active_texture_unit_;
+
  private:
   scoped_ptr<ErrorState> error_state_;
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_CONTEXT_STATE_H_