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

gpu/command_buffer/service/gles2_cmd_decoder.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 GLES2Decoder class.
 
 #ifndef GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_H_
 #define GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_H_
 
 #include <vector>
@@ skipping 16 matching lines @@
 namespace gpu {
 
 class AsyncPixelTransferDelegate;
 class AsyncPixelTransferManager;
 class StreamTextureManager;
 struct Mailbox;
 
 namespace gles2 {
 
 class ContextGroup;
+class ContextState;
 class ErrorState;
 class GLES2Util;
 class Logger;
 class QueryManager;
 class VertexArrayManager;
 
 struct DisallowedFeatures {
   DisallowedFeatures()
       : multisampling(false),
         gpu_memory_manager(false) {
@@ skipping 86 matching lines @@
 
   // Gets the associated GLContext.
   virtual gfx::GLContext* GetGLContext() = 0;
 
   // Gets the associated ContextGroup
   virtual ContextGroup* GetContextGroup() = 0;
 
   virtual Capabilities GetCapabilities() = 0;
 
   // Restores all of the decoder GL state.
-  virtual void RestoreState() const = 0;
+  virtual void RestoreState(const ContextState* prev_state) const = 0;
 
   // Restore States.
   virtual void RestoreActiveTexture() const = 0;
   virtual void RestoreAllTextureUnitBindings() const = 0;
   virtual void RestoreAttribute(unsigned index) const = 0;
   virtual void RestoreBufferBindings() const = 0;
   virtual void RestoreFramebufferBindings() const = 0;
   virtual void RestoreGlobalState() const = 0;
   virtual void RestoreProgramBindings() const = 0;
   virtual void RestoreRenderbufferBindings() const = 0;
@@ skipping 67 matching lines @@
   virtual bool WasContextLost() = 0;
 
   // Returns true if the context was lost specifically by GL_ARB_robustness.
   virtual bool WasContextLostByRobustnessExtension() = 0;
 
   // Lose this context.
   virtual void LoseContext(uint32 reset_status) = 0;
 
   virtual Logger* GetLogger() = 0;
 
+  virtual const ContextState* GetContextState() = 0;
+
  protected:
   GLES2Decoder();
 
  private:
   bool initialized_;
   bool debug_;
   bool log_commands_;
 
   DISALLOW_COPY_AND_ASSIGN(GLES2Decoder);
 };
 
 }  // namespace gles2
 }  // namespace gpu
+
 #endif  // GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_H_