gpu: Initial implementation of CommitOverlayPlanes

gpu/command_buffer/client/gles2_implementation.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.
 
 // A class to emulate GLES2 over command buffers.
 
 #include "gpu/command_buffer/client/gles2_implementation.h"
 
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
@@ skipping 4282 matching lines @@
 
 void GLES2Implementation::Swap() {
   SwapBuffers();
 }
 
 void GLES2Implementation::PartialSwapBuffers(const gfx::Rect& sub_buffer) {
   PostSubBufferCHROMIUM(
       sub_buffer.x(), sub_buffer.y(), sub_buffer.width(), sub_buffer.height());
 }
 
-void GLES2Implementation::CommitOverlayPlanesCHROMIUM() {
-  // TODO(watk): crbug.com/560592
-  NOTIMPLEMENTED();
+void GLES2Implementation::CommitOverlayPlanes() {
+  CommitOverlayPlanesCHROMIUM();
 }
 
 static GLenum GetGLESOverlayTransform(gfx::OverlayTransform plane_transform) {
   switch (plane_transform) {
     case gfx::OVERLAY_TRANSFORM_INVALID:
       break;
     case gfx::OVERLAY_TRANSFORM_NONE:
       return GL_OVERLAY_TRANSFORM_NONE_CHROMIUM;
     case gfx::OVERLAY_TRANSFORM_FLIP_HORIZONTAL:
       return GL_OVERLAY_TRANSFORM_FLIP_HORIZONTAL_CHROMIUM;
@@ skipping 44 matching lines @@
   }
   GLfloat* mem = static_cast<GLfloat*>(buffer.address());
   memcpy(mem + 0, contents_rect, 4 * sizeof(GLfloat));
   memcpy(mem + 4, bounds_size, 2 * sizeof(GLfloat));
   memcpy(mem + 6, transform, 16 * sizeof(GLfloat));
   helper_->ScheduleCALayerCHROMIUM(contents_texture_id, opacity,
                                    background_color, buffer.shm_id(),
                                    buffer.offset());
 }
 
+void GLES2Implementation::CommitOverlayPlanesCHROMIUM() {
+  GPU_CLIENT_SINGLE_THREAD_CHECK();
+  GPU_CLIENT_LOG("[" << GetLogPrefix() << "] CommitOverlayPlanesCHROMIUM()");
+  TRACE_EVENT0("gpu", "GLES2::CommitOverlayPlanesCHROMIUM");
+
+  // Same flow control as GLES2Implementation::SwapBuffers (see comments there).
+  swap_buffers_tokens_.push(helper_->InsertToken());
+  helper_->CommitOverlayPlanesCHROMIUM();
+  helper_->CommandBufferHelper::Flush();
+  if (swap_buffers_tokens_.size() > kMaxSwapBuffers + 1) {
+    helper_->WaitForToken(swap_buffers_tokens_.front());
+    swap_buffers_tokens_.pop();
+  }
+}
+
 GLboolean GLES2Implementation::EnableFeatureCHROMIUM(
     const char* feature) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glEnableFeatureCHROMIUM("
                  << feature << ")");
   TRACE_EVENT0("gpu", "GLES2::EnableFeatureCHROMIUM");
   typedef cmds::EnableFeatureCHROMIUM::Result Result;
   Result* result = GetResultAs<Result*>();
   if (!result) {
     return false;
@@ skipping 2017 matching lines @@
   CheckGLError();
 }
 
 // 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/client/gles2_implementation_impl_autogen.h"
 
 }  // namespace gles2
 }  // namespace gpu