gpu: Reuse transfer buffers more aggresively

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 <GLES2/gl2extchromium.h>
@@ skipping 2663 matching lines @@
   // Test BeginQueryEXT inserts command.
   struct BeginCmds {
     cmds::BeginQueryEXT begin_query;
   };
   BeginCmds expected_begin_cmds;
   const void* commands = GetPut();
   gl_->BeginQueryEXT(GL_ANY_SAMPLES_PASSED_EXT, id1);
   QueryTracker::Query* query = GetQuery(id1);
   ASSERT_TRUE(query != NULL);
   expected_begin_cmds.begin_query.Init(
-      GL_ANY_SAMPLES_PASSED_EXT, id1, query->shm_id(), query->shm_offset());
+      GL_ANY_SAMPLES_PASSED_EXT,
+      id1,
+      query->internal(),
+      query->shm_id(),
+      query->shm_offset());
   EXPECT_EQ(0, memcmp(
       &expected_begin_cmds, commands, sizeof(expected_begin_cmds)));
   ClearCommands();
 
   // Test GetQueryivEXT returns id.
   param = -1;
   gl_->GetQueryivEXT(GL_ANY_SAMPLES_PASSED_EXT, GL_CURRENT_QUERY_EXT, &param);
   EXPECT_EQ(id1, static_cast<GLuint>(param));
   gl_->GetQueryivEXT(
       GL_ANY_SAMPLES_PASSED_CONSERVATIVE_EXT, GL_CURRENT_QUERY_EXT, &param);
   EXPECT_EQ(0, param);
 
   // Test BeginQueryEXT fails if between Begin/End.
   gl_->BeginQueryEXT(GL_ANY_SAMPLES_PASSED_EXT, id2);
   EXPECT_TRUE(NoCommandsWritten());
   EXPECT_EQ(GL_INVALID_OPERATION, CheckError());
 
   // Test EndQueryEXT fails if target not same as current query.
   ClearCommands();
   gl_->EndQueryEXT(GL_ANY_SAMPLES_PASSED_CONSERVATIVE_EXT);
   EXPECT_TRUE(NoCommandsWritten());
   EXPECT_EQ(GL_INVALID_OPERATION, CheckError());
 
   // Test EndQueryEXT sends command
   struct EndCmds {
     cmds::EndQueryEXT end_query;
   };
   EndCmds expected_end_cmds;
   expected_end_cmds.end_query.Init(
-      GL_ANY_SAMPLES_PASSED_EXT, query->submit_count());
+      GL_ANY_SAMPLES_PASSED_EXT, query->internal(), query->submit_count());
   commands = GetPut();
   gl_->EndQueryEXT(GL_ANY_SAMPLES_PASSED_EXT);
   EXPECT_EQ(0, memcmp(
       &expected_end_cmds, commands, sizeof(expected_end_cmds)));
 
   // Test EndQueryEXT fails if no current query.
   ClearCommands();
   gl_->EndQueryEXT(GL_ANY_SAMPLES_PASSED_EXT);
   EXPECT_TRUE(NoCommandsWritten());
   EXPECT_EQ(GL_INVALID_OPERATION, CheckError());
 
   // Test 2nd Begin/End increments count.
   uint32 old_submit_count = query->submit_count();
   gl_->BeginQueryEXT(GL_ANY_SAMPLES_PASSED_EXT, id1);
   EXPECT_NE(old_submit_count, query->submit_count());
   expected_end_cmds.end_query.Init(
-      GL_ANY_SAMPLES_PASSED_EXT, query->submit_count());
+      GL_ANY_SAMPLES_PASSED_EXT, query->internal(), query->submit_count());
   commands = GetPut();
   gl_->EndQueryEXT(GL_ANY_SAMPLES_PASSED_EXT);
   EXPECT_EQ(0, memcmp(
       &expected_end_cmds, commands, sizeof(expected_end_cmds)));
 
   // Test BeginQueryEXT fails if target changed.
   ClearCommands();
   gl_->BeginQueryEXT(GL_ANY_SAMPLES_PASSED_CONSERVATIVE_EXT, id1);
   EXPECT_TRUE(NoCommandsWritten());
   EXPECT_EQ(GL_INVALID_OPERATION, CheckError());
@@ skipping 31 matching lines @@
   QueryTracker::Query* query = GetQuery(id);
   ASSERT_TRUE(query != NULL);
 
   // Test EndQueryEXT sends both begin and end command
   struct EndCmds {
     cmds::BeginQueryEXT begin_query;
     cmds::EndQueryEXT end_query;
   };
   EndCmds expected_end_cmds;
   expected_end_cmds.begin_query.Init(
-      GL_GET_ERROR_QUERY_CHROMIUM, id, query->shm_id(), query->shm_offset());
+      GL_GET_ERROR_QUERY_CHROMIUM,
+      id,
+      query->internal(),
+      query->shm_id(),
+      query->shm_offset());
   expected_end_cmds.end_query.Init(
-      GL_GET_ERROR_QUERY_CHROMIUM, query->submit_count());
+      GL_GET_ERROR_QUERY_CHROMIUM, query->internal(), query->submit_count());
   const void* commands = GetPut();
   gl_->EndQueryEXT(GL_GET_ERROR_QUERY_CHROMIUM);
   EXPECT_EQ(0, memcmp(
       &expected_end_cmds, commands, sizeof(expected_end_cmds)));
   ClearCommands();
 
   // Check result is not yet available.
   GLuint available = 0xBDu;
   gl_->GetQueryObjectuivEXT(id, GL_QUERY_RESULT_AVAILABLE_EXT, &available);
   EXPECT_TRUE(NoCommandsWritten());
@@ skipping 75 matching lines @@
   ClearCommands();
   gl_->Enable(GL_BLEND);
   EXPECT_TRUE(NoCommandsWritten());
 }
 
 
 #include "gpu/command_buffer/client/gles2_implementation_unittest_autogen.h"
 
 }  // namespace gles2
 }  // namespace gpu