Cache more GL state both service and client side.

gpu/command_buffer/client/gles2_implementation_unittest.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.
 
 // Tests for GLES2Implementation.
 
 #include "gpu/command_buffer/client/gles2_implementation.h"
 
 #include <GLES2/gl2ext.h>
 #include "gpu/command_buffer/client/client_test_helper.h"
@@ skipping 345 matching lines @@
 
     transfer_buffer_.reset(new MockTransferBuffer(
         command_buffer(),
         kTransferBufferSize,
         GLES2Implementation::kStartingOffset,
         GLES2Implementation::kAlignment));
 
     helper_.reset(new GLES2CmdHelper(command_buffer()));
     helper_->Initialize(kCommandBufferSizeBytes);
 
-    GLES2Implementation::GLCachedState state;
-    GLES2Implementation::GLCachedState::IntState& int_state = state.int_state;
+    GLES2Implementation::GLStaticState state;
+    GLES2Implementation::GLStaticState::IntState& int_state = state.int_state;
     int_state.max_combined_texture_image_units = kMaxCombinedTextureImageUnits;
     int_state.max_cube_map_texture_size = kMaxCubeMapTextureSize;
     int_state.max_fragment_uniform_vectors = kMaxFragmentUniformVectors;
     int_state.max_renderbuffer_size = kMaxRenderbufferSize;
     int_state.max_texture_image_units = kMaxTextureImageUnits;
     int_state.max_texture_size = kMaxTextureSize;
     int_state.max_varying_vectors = kMaxVaryingVectors;
     int_state.max_vertex_attribs = kMaxVertexAttribs;
     int_state.max_vertex_texture_image_units = kMaxVertexTextureImageUnits;
     int_state.max_vertex_uniform_vectors = kMaxVertexUniformVectors;
@@ skipping 2170 matching lines @@
   };
   struct Cmds {
     Enable enable_cmd;
   };
   Cmds expected;
 
   for (size_t ii = 0; ii < arraysize(kStates); ++ii) {
     GLenum state = kStates[ii];
     expected.enable_cmd.Init(state);
     GLboolean result = gl_->IsEnabled(state);
-    EXPECT_FALSE(result);
+    EXPECT_EQ(static_cast<GLboolean>(ii == 0), result);
     EXPECT_TRUE(NoCommandsWritten());
     const void* commands = GetPut();
-    gl_->Enable(state);
-    EXPECT_EQ(0, memcmp(&expected, commands, sizeof(expected)));
+    if (!result) {
+      gl_->Enable(state);
+      EXPECT_EQ(0, memcmp(&expected, commands, sizeof(expected)));
+    }
     ClearCommands();
     result = gl_->IsEnabled(state);
     EXPECT_TRUE(result);
     EXPECT_TRUE(NoCommandsWritten());
   }
 }
 
 TEST_F(GLES2ImplementationTest, BeginEndQueryEXT) {
   // Test GetQueryivEXT returns 0 if no current query.
   GLint param = -1;
@@ skipping 188 matching lines @@
       kAttribIndex1, kNumComponents1, GL_FLOAT, GL_FALSE, kClientStride,
       reinterpret_cast<const void*>(4));
   EXPECT_EQ(GL_INVALID_OPERATION, CheckError());
 
   gl_->VertexAttribPointer(
       kAttribIndex1, kNumComponents1, GL_FLOAT, GL_FALSE, kClientStride, NULL);
   EXPECT_EQ(GL_NO_ERROR, CheckError());
 }
 #endif
 
+TEST_F(GLES2ImplementationTest, Disable) {
+  struct Cmds {
+    Disable cmd;
+  };
+  Cmds expected;
+  expected.cmd.Init(GL_DITHER);  // Note: DITHER defaults to enabled.
+
+  gl_->Disable(GL_DITHER);
+  EXPECT_EQ(0, memcmp(&expected, commands_, sizeof(expected)));
+  // Check it's cached and not called again.
+  ClearCommands();
+  gl_->Disable(GL_DITHER);
+  EXPECT_TRUE(NoCommandsWritten());
+}
+
+TEST_F(GLES2ImplementationTest, Enable) {
+  struct Cmds {
+    Enable cmd;
+  };
+  Cmds expected;
+  expected.cmd.Init(GL_BLEND);  // Note: BLEND defaults to disabled.
+
+  gl_->Enable(GL_BLEND);
+  EXPECT_EQ(0, memcmp(&expected, commands_, sizeof(expected)));
+  // Check it's cached and not called again.
+  ClearCommands();
+  gl_->Enable(GL_BLEND);
+  EXPECT_TRUE(NoCommandsWritten());
+}
+
+
 #include "gpu/command_buffer/client/gles2_implementation_unittest_autogen.h"
 
 }  // namespace gles2
 }  // namespace gpu