Restore only modified texture state during virtual context switches

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 "gpu/command_buffer/common/gles2_cmd_utils.h"
 #include "gpu/command_buffer/service/buffer_manager.h"
 #include "gpu/command_buffer/service/error_state.h"
 #include "gpu/command_buffer/service/framebuffer_manager.h"
 #include "gpu/command_buffer/service/program_manager.h"
 #include "gpu/command_buffer/service/renderbuffer_manager.h"
+#include "ui/gl/dirty_texture_state.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_implementation.h"
 
 namespace gpu {
 namespace gles2 {
 
 namespace {
 
 void EnableDisable(GLenum pname, bool enable) {
   if (enable) {
@@ skipping 17 matching lines @@
       pack_reverse_row_order(false),
       fbo_binding_for_scissor_workaround_dirty_(false),
       feature_info_(feature_info),
       error_state_(ErrorState::Create(logger)) {
   Initialize();
 }
 
 ContextState::~ContextState() {
 }
 
-void ContextState::RestoreTextureUnitBindings(GLuint unit) const {
+void ContextState::RestoreTextureUnitBindings(
+    GLuint unit, const gfx::DirtyTextureState* dirty_texture_state) const {
   DCHECK_LT(unit, texture_units.size());
   const TextureUnit& texture_unit = texture_units[unit];
   glActiveTexture(GL_TEXTURE0 + unit);
-  GLuint service_id = texture_unit.bound_texture_2d.get()
-                          ? texture_unit.bound_texture_2d->service_id()
-                          : 0;
-  glBindTexture(GL_TEXTURE_2D, service_id);
-  service_id = texture_unit.bound_texture_cube_map.get()
-                   ? texture_unit.bound_texture_cube_map->service_id()
-                   : 0;
-  glBindTexture(GL_TEXTURE_CUBE_MAP, service_id);
+  if (!dirty_texture_state ||
+      dirty_texture_state->IsBinding2DDirtyForUnit(unit)) {
+    GLuint service_id = texture_unit.bound_texture_2d.get()
+                            ? texture_unit.bound_texture_2d->service_id()
+                            : 0;
+    glBindTexture(GL_TEXTURE_2D, service_id);
+  }
 
-  if (feature_info_->feature_flags().oes_egl_image_external) {
-    service_id = texture_unit.bound_texture_external_oes.get()
-                     ? texture_unit.bound_texture_external_oes->service_id()
-                     : 0;
+  if (!dirty_texture_state ||
+      dirty_texture_state->IsBindingCubeMapDirtyForUnit(unit)) {
+    GLuint service_id = texture_unit.bound_texture_cube_map.get()
+                            ? texture_unit.bound_texture_cube_map->service_id()
+                            : 0;
+    glBindTexture(GL_TEXTURE_CUBE_MAP, service_id);
+  }
+
+  if (feature_info_->feature_flags().oes_egl_image_external &&
+      (!dirty_texture_state ||
+       dirty_texture_state->IsBindingExternalOesDirtyForUnit(unit))) {
+    GLuint service_id =
+        texture_unit.bound_texture_external_oes.get()
+            ? texture_unit.bound_texture_external_oes->service_id()
+            : 0;
     glBindTexture(GL_TEXTURE_EXTERNAL_OES, service_id);
   }
 
-  if (feature_info_->feature_flags().arb_texture_rectangle) {
-    service_id = texture_unit.bound_texture_rectangle_arb.get()
-                     ? texture_unit.bound_texture_rectangle_arb->service_id()
-                     : 0;
+  if (feature_info_->feature_flags().arb_texture_rectangle &&
+      (!dirty_texture_state ||
+       dirty_texture_state->IsBindingRectangleArbDirtyForUnit(unit))) {
+    GLuint service_id =
+        texture_unit.bound_texture_rectangle_arb.get()
+            ? texture_unit.bound_texture_rectangle_arb->service_id()
+            : 0;
     glBindTexture(GL_TEXTURE_RECTANGLE_ARB, service_id);
   }
 }
 
 void ContextState::RestoreBufferBindings() const {
   if (vertex_attrib_manager.get()) {
     Buffer* element_array_buffer =
         vertex_attrib_manager->element_array_buffer();
     glBindBuffer(GL_ELEMENT_ARRAY_BUFFER,
         element_array_buffer ? element_array_buffer->service_id() : 0);
@@ skipping 10 matching lines @@
 }
 
 void ContextState::RestoreProgramBindings() const {
   glUseProgram(current_program.get() ? current_program->service_id() : 0);
 }
 
 void ContextState::RestoreActiveTexture() const {
   glActiveTexture(GL_TEXTURE0 + active_texture_unit);
 }
 
-void ContextState::RestoreAllTextureUnitBindings() const {
+void ContextState::RestoreAllTextureUnitBindings(
+    const gfx::DirtyTextureState* dirty_texture_state) const {
+  size_t texture_units_to_restore =
+      dirty_texture_state ?
+          dirty_texture_state->GetMaxTextureUnitIndex() + 1
+              : texture_units.size();
   // Restore Texture state.
-  for (size_t ii = 0; ii < texture_units.size(); ++ii) {
-    RestoreTextureUnitBindings(ii);
+  for (size_t ii = 0; ii < texture_units_to_restore; ++ii) {
+    RestoreTextureUnitBindings(ii, dirty_texture_state);
   }
   RestoreActiveTexture();
 }
 
 void ContextState::RestoreAttribute(GLuint attrib_index) const {
   const VertexAttrib* attrib =
       vertex_attrib_manager->GetVertexAttrib(attrib_index);
   const void* ptr = reinterpret_cast<const void*>(attrib->offset());
   Buffer* buffer = attrib->buffer();
   glBindBuffer(GL_ARRAY_BUFFER, buffer ? buffer->service_id() : 0);
@@ skipping 14 matching lines @@
     }
   }
   glVertexAttrib4fv(attrib_index, attrib_values[attrib_index].v);
 }
 
 void ContextState::RestoreGlobalState() const {
   InitCapabilities();
   InitState();
 }
 
-void ContextState::RestoreState() const {
-  RestoreAllTextureUnitBindings();
+void ContextState::RestoreState(
+    const gfx::DirtyTextureState* dirty_texture_state) const {
+  RestoreAllTextureUnitBindings(dirty_texture_state);
 
   // Restore Attrib State
   // TODO: This if should not be needed. RestoreState is getting called
   // before GLES2Decoder::Initialize which is a bug.
   if (vertex_attrib_manager.get()) {
     // TODO(gman): Move this restoration to VertexAttribManager.
     for (size_t attrib = 0; attrib < vertex_attrib_manager->num_attribs();
          ++attrib) {
       RestoreAttribute(attrib);
     }
@@ skipping 11 matching lines @@
 
 // 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