Restore samplers' state across virtualized GL contexts.

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 263 matching lines @@
     glBindTexture(GL_TEXTURE_CUBE_MAP, service_id_cube);
   }
   if (bind_texture_oes) {
     glBindTexture(GL_TEXTURE_EXTERNAL_OES, service_id_oes);
   }
   if (bind_texture_arb) {
     glBindTexture(GL_TEXTURE_RECTANGLE_ARB, service_id_arb);
   }
 }
 
+void ContextState::RestoreSamplerBinding(GLuint unit,
+                                         const ContextState* prev_state) const {
+  if (!feature_info_->IsES3Capable())
+    return;
+  const scoped_refptr<Sampler>& cur_sampler = sampler_units[unit];
+  GLuint cur_id = cur_sampler ? cur_sampler->service_id() : 0;
+  GLuint prev_id = 0;
+  if (prev_state) {
+    const scoped_refptr<Sampler>& prev_sampler =
+        prev_state->sampler_units[unit];
+    prev_id = prev_sampler ? prev_sampler->service_id() : 0;
+  }
+  if (cur_id != prev_id) {

[jbauman, 2017/04/25 22:47:07]

"if (!prev_state || cur_id != prev_id) {"

I think in theory a null prev_state means the previous state is unknown and
everything has to be restored. That's what RestoreTextureUnitBindings is doing,
anyway.

[Ken Russell (switch to Gerrit), 2017/04/26 01:02:25]

Thank you for catching this. Done in current patch set.

+    glBindSampler(unit, cur_id);
+  }
+}
+
 void ContextState::PushTextureDecompressionUnpackState() const {
   glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
 
   if (bound_pixel_unpack_buffer.get()) {
     glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
     glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
     glPixelStorei(GL_UNPACK_IMAGE_HEIGHT, 0);
   }
 }
 
@@ skipping 68 matching lines @@
   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(
+void ContextState::RestoreAllTextureUnitAndSamplerBindings(
     const ContextState* prev_state) const {
   // Restore Texture state.
   for (size_t ii = 0; ii < texture_units.size(); ++ii) {
     RestoreTextureUnitBindings(ii, prev_state);
+    RestoreSamplerBinding(ii, prev_state);
   }
   RestoreActiveTexture();
 }
 
 void ContextState::RestoreActiveTextureUnitBinding(unsigned int target) const {
   DCHECK_LT(active_texture_unit, texture_units.size());
   const TextureUnit& texture_unit = texture_units[active_texture_unit];
   if (TargetIsSupported(feature_info_, target))
     glBindTexture(target, GetServiceId(texture_unit, target));
 }
@@ skipping 102 matching lines @@
   // glVertexAttrib4fv aren't part of VAO state and must be restored.
   RestoreVertexAttribValues();
 }
 
 void ContextState::RestoreGlobalState(const ContextState* prev_state) const {
   InitCapabilities(prev_state);
   InitState(prev_state);
 }
 
 void ContextState::RestoreState(const ContextState* prev_state) {
-  RestoreAllTextureUnitBindings(prev_state);
+  RestoreAllTextureUnitAndSamplerBindings(prev_state);
   RestoreVertexAttribs();
   RestoreBufferBindings();
   RestoreRenderbufferBindings();
   RestoreProgramSettings(prev_state, true);
   RestoreIndexedUniformBufferBindings(prev_state);
   RestoreGlobalState(prev_state);
 
   // FRAMEBUFFER_SRGB will be restored lazily at render time.
   framebuffer_srgb_valid_ = false;
 }
@@ skipping 203 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