Restore samplers' state across virtualized GL contexts.

gpu/command_buffer/service/gles2_cmd_decoder_unittest_context_state.cc

Index: gpu/command_buffer/service/gles2_cmd_decoder_unittest_context_state.cc
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_context_state.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_context_state.cc
index 97136e1fc7fc2d15cd2dd411bec3122b64e758c4..68285276fb733dbc7265eb48e4812a09e5c60728 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_context_state.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_context_state.cc
@@ -136,7 +136,7 @@ TEST_P(GLES2DecoderRestoreStateTest, NullPreviousStateBGR) {
   // Expect to restore the active texture unit to GL_TEXTURE0.
   AddExpectationsForActiveTexture(GL_TEXTURE0);
 
-  GetDecoder()->RestoreAllTextureUnitBindings(NULL);
+  GetDecoder()->RestoreAllTextureUnitAndSamplerBindings(NULL);
 }
 
 TEST_P(GLES2DecoderRestoreStateTest, NullPreviousState) {

[jbauman, 2017/04/26 01:22:45]

Could you modify these these tests to init the decoder with
CONTEXT_TYPE_OPENGLES3? I think the mock should catch any new calls that are
made.

[Ken Russell (switch to Gerrit), 2017/04/26 21:36:35]

Thanks for the suggestion. Rather than do this, I've added three new tests to
this file which explicitly test the restoration of samplers.

@@ -160,7 +160,7 @@ TEST_P(GLES2DecoderRestoreStateTest, NullPreviousState) {
   // Expect to restore the active texture unit to GL_TEXTURE0.
   AddExpectationsForActiveTexture(GL_TEXTURE0);
 
-  GetDecoder()->RestoreAllTextureUnitBindings(NULL);
+  GetDecoder()->RestoreAllTextureUnitAndSamplerBindings(NULL);
 }
 
 TEST_P(GLES2DecoderRestoreStateTest, WithPreviousStateBGR) {
@@ -184,7 +184,7 @@ TEST_P(GLES2DecoderRestoreStateTest, WithPreviousStateBGR) {
   // Expect to restore active texture unit to GL_TEXTURE0.
   AddExpectationsForActiveTexture(GL_TEXTURE0);
 
-  GetDecoder()->RestoreAllTextureUnitBindings(&prev_state);
+  GetDecoder()->RestoreAllTextureUnitAndSamplerBindings(&prev_state);
 }
 
 TEST_P(GLES2DecoderRestoreStateTest, WithPreviousState) {
@@ -207,7 +207,7 @@ TEST_P(GLES2DecoderRestoreStateTest, WithPreviousState) {
   // Expect to restore active texture unit to GL_TEXTURE0.
   AddExpectationsForActiveTexture(GL_TEXTURE0);
 
-  GetDecoder()->RestoreAllTextureUnitBindings(&prev_state);
+  GetDecoder()->RestoreAllTextureUnitAndSamplerBindings(&prev_state);
 }
 
 TEST_P(GLES2DecoderRestoreStateTest, ActiveUnit1) {
@@ -237,7 +237,7 @@ TEST_P(GLES2DecoderRestoreStateTest, ActiveUnit1) {
   // Expect to restore active texture unit to GL_TEXTURE1.
   AddExpectationsForActiveTexture(GL_TEXTURE1);
 
-  GetDecoder()->RestoreAllTextureUnitBindings(&prev_state);
+  GetDecoder()->RestoreAllTextureUnitAndSamplerBindings(&prev_state);
 }
 
 TEST_P(GLES2DecoderRestoreStateTest, NonDefaultUnit0BGR) {
@@ -275,7 +275,7 @@ TEST_P(GLES2DecoderRestoreStateTest, NonDefaultUnit0BGR) {
   // Expect to restore active texture unit to GL_TEXTURE1.
   AddExpectationsForActiveTexture(GL_TEXTURE1);
 
-  GetDecoder()->RestoreAllTextureUnitBindings(&prev_state);
+  GetDecoder()->RestoreAllTextureUnitAndSamplerBindings(&prev_state);
 }
 
 TEST_P(GLES2DecoderRestoreStateTest, NonDefaultUnit1BGR) {
@@ -307,7 +307,7 @@ TEST_P(GLES2DecoderRestoreStateTest, NonDefaultUnit1BGR) {
   // Expect to restore active texture unit to GL_TEXTURE0.
   AddExpectationsForActiveTexture(GL_TEXTURE0);
 
-  GetDecoder()->RestoreAllTextureUnitBindings(&prev_state);
+  GetDecoder()->RestoreAllTextureUnitAndSamplerBindings(&prev_state);
 }
 
 TEST_P(GLES2DecoderRestoreStateTest, DefaultUnit0) {
@@ -343,7 +343,7 @@ TEST_P(GLES2DecoderRestoreStateTest, DefaultUnit0) {
   // Expect to restore active texture unit to GL_TEXTURE1.
   AddExpectationsForActiveTexture(GL_TEXTURE1);
 
-  GetDecoder()->RestoreAllTextureUnitBindings(&prev_state);
+  GetDecoder()->RestoreAllTextureUnitAndSamplerBindings(&prev_state);
 }
 
 TEST_P(GLES2DecoderRestoreStateTest, DefaultUnit1) {
@@ -373,7 +373,7 @@ TEST_P(GLES2DecoderRestoreStateTest, DefaultUnit1) {
   // Expect to restore active texture unit to GL_TEXTURE0.
   AddExpectationsForActiveTexture(GL_TEXTURE0);
 
-  GetDecoder()->RestoreAllTextureUnitBindings(&prev_state);
+  GetDecoder()->RestoreAllTextureUnitAndSamplerBindings(&prev_state);
 }
 
 TEST_P(GLES2DecoderManualInitTest, ContextStateCapabilityCaching) {