Change the GLES2Implementation Flush and Finish functions...

gpu/command_buffer/client/gles2_implementation.cc

 // Copyright (c) 2009 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.
 
 // A class to emluate GLES2 over command buffers.
 
 #include "gpu/command_buffer/client/gles2_implementation.h"
 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
 
 namespace gpu {
@@ skipping 42 matching lines @@
     id_allocator_.FreeID(ids[ii]);
   }
 }
 
 void GLES2Implementation::CopyResult(void* dst) {
   SizedResult* result = static_cast<SizedResult*>(result_buffer_);
   memcpy(dst, result->GetDataAs<void*>(), result->size);
 }
 
 void GLES2Implementation::WaitForCmd() {
-  int32 token = helper_->InsertToken();
-  helper_->WaitForToken(token);
+  helper_->CommandBufferHelper::Finish();
 }
 
 void GLES2Implementation::DrawElements(
     GLenum mode, GLsizei count, GLenum type, const void* indices) {
   helper_->DrawElements(mode, count, type, ToGLuint(indices));
 }
 
+void GLES2Implementation::Flush() {
+  // Insert the cmd to call glFlush
+  helper_->Flush();
+  // Flush our command buffer
+  // (tell the service to execute upto the flush cmd.)
+  helper_->CommandBufferHelper::Flush();
+}
+
 void GLES2Implementation::Finish() {
+  // Insert the cmd to call glFinish
   helper_->Finish();
-  WaitForCmd();
+  // Flinish our command buffer
+  // (tell the service to execute upto the Finish cmd and wait for it to
+  // execute.)
+  helper_->CommandBufferHelper::Finish();
 }
 
 void GLES2Implementation::SwapBuffers() {
   helper_->SwapBuffers();
-  Finish();
+  Flush();
 }
 
 void GLES2Implementation::GetVertexAttribPointerv(
     GLuint index, GLenum pname, void** ptr) {
   helper_->GetVertexAttribPointerv(
     index, pname, result_shm_id(), result_shm_offset());
   WaitForCmd();
   CopyResult(ptr);
 };
 
@@ skipping 249 matching lines @@
 }
 
 void GLES2Implementation::ReadPixels(
     GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type,
     void* pixels) {
   // TODO(gman): implement.
 }
 
 }  // namespace gles2
 }  // namespace gpu