Break glScheduleCALayerCHROMIUM into smaller functions.

gpu/command_buffer/service/gles2_cmd_decoder.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.
 
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
 
 #include <limits.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
@@ skipping 2268 matching lines @@
   // the current generation when our context becomes current, then we'll rebind
   // all the textures to stay up to date with Texture::service_id() changes.
   uint32_t texture_manager_service_id_generation_;
 
   bool force_shader_name_hashing_for_test;
 
   GLfloat line_width_range_[2];
 
   SamplerState default_sampler_state_;
 
+  struct CALayerSharedState{
+    float opacity;
+    bool is_clipped;
+    gfx::Rect clip_rect;
+    int sorting_context_id;
+    gfx::Transform transform;
+  };
+
+  std::unique_ptr<CALayerSharedState> ca_layer_shared_state_;
+
   DISALLOW_COPY_AND_ASSIGN(GLES2DecoderImpl);
 };
 
 const GLES2DecoderImpl::CommandInfo GLES2DecoderImpl::command_info[] = {
 #define GLES2_CMD_OP(name)                                   \
   {                                                          \
     &GLES2DecoderImpl::Handle##name, cmds::name::kArgFlags,  \
         cmds::name::cmd_flags,                               \
         sizeof(cmds::name) / sizeof(CommandBufferEntry) - 1, \
   }                                                          \
@@ skipping 8427 matching lines @@
           image,
           gfx::Rect(c.bounds_x, c.bounds_y, c.bounds_width, c.bounds_height),
           gfx::RectF(c.uv_x, c.uv_y, c.uv_width, c.uv_height))) {
     LOCAL_SET_GL_ERROR(GL_INVALID_OPERATION,
                        "glScheduleOverlayPlaneCHROMIUM",
                        "failed to schedule overlay");
   }
   return error::kNoError;
 }
 
+error::Error GLES2DecoderImpl::HandleScheduleCALayerSharedStateCHROMIUM(
+    uint32_t immediate_data_size,
+    const void* cmd_data) {
+  const gles2::cmds::ScheduleCALayerSharedStateCHROMIUM& c =
+      *static_cast<const gles2::cmds::ScheduleCALayerSharedStateCHROMIUM*>(
+          cmd_data);
+
+  const GLfloat* mem = GetSharedMemoryAs<const GLfloat*>(c.shm_id, c.shm_offset,
+                                                         20 * sizeof(GLfloat));
+  if (!mem) {
+    return error::kOutOfBounds;
+  }
+  gfx::RectF clip_rect(mem[0], mem[1], mem[2], mem[3]);
+  gfx::Transform transform(mem[4], mem[8], mem[12], mem[16],
+                           mem[5], mem[9], mem[13], mem[17],
+                           mem[6], mem[10], mem[14], mem[18],
+                           mem[7], mem[11], mem[15], mem[19]);
+  ca_layer_shared_state_.reset(new CALayerSharedState);
+  ca_layer_shared_state_->opacity = c.opacity;
+  ca_layer_shared_state_->is_clipped = c.is_clipped ? true : false;
+  ca_layer_shared_state_->clip_rect = gfx::ToEnclosingRect(clip_rect);
+  ca_layer_shared_state_->sorting_context_id = c.sorting_context_id;
+  ca_layer_shared_state_->transform = transform;
+  return error::kNoError;
+}
+
 error::Error GLES2DecoderImpl::HandleScheduleCALayerCHROMIUM(
     uint32_t immediate_data_size,
     const void* cmd_data) {
   const gles2::cmds::ScheduleCALayerCHROMIUM& c =
       *static_cast<const gles2::cmds::ScheduleCALayerCHROMIUM*>(cmd_data);
   GLuint filter = c.filter;
   if (filter != GL_NEAREST && filter != GL_LINEAR) {
     LOCAL_SET_GL_ERROR(GL_INVALID_VALUE, "glScheduleCALayerCHROMIUM",
                        "invalid filter");
     return error::kNoError;
   }
 
+  if (!ca_layer_shared_state_) {
+    LOCAL_SET_GL_ERROR(
+        GL_INVALID_VALUE, "glScheduleCALayerCHROMIUM",

[piman, 2016/07/19 20:56:46]

nit: commonly GL_INVALID_OPERATION is the error raised when there is a state
inconsistency between multiple calls.

Either way, could you mention this in the extension text?

[erikchen, 2016/07/19 21:40:21]

Done.

+        "glScheduleCALayerSharedStateCHROMIUM has not been called");
+    return error::kNoError;
+  }
+
   gl::GLImage* image = nullptr;
   GLuint contents_texture_id = c.contents_texture_id;
   if (contents_texture_id) {
     TextureRef* ref = texture_manager()->GetTexture(contents_texture_id);
     if (!ref) {
       LOCAL_SET_GL_ERROR(GL_INVALID_VALUE, "glScheduleCALayerCHROMIUM",
                          "unknown texture");
       return error::kNoError;
     }
     Texture::ImageState image_state;
     image = ref->texture()->GetLevelImage(ref->texture()->target(), 0,
                                           &image_state);
     if (!image) {
       LOCAL_SET_GL_ERROR(GL_INVALID_VALUE, "glScheduleCALayerCHROMIUM",
                          "unsupported texture format");
       return error::kNoError;
     }
   }
 
   const GLfloat* mem = GetSharedMemoryAs<const GLfloat*>(c.shm_id, c.shm_offset,
-                                                         28 * sizeof(GLfloat));
+                                                         8 * sizeof(GLfloat));
   if (!mem) {
     return error::kOutOfBounds;
   }
   gfx::RectF contents_rect(mem[0], mem[1], mem[2], mem[3]);
   gfx::RectF bounds_rect(mem[4], mem[5], mem[6], mem[7]);
-  gfx::RectF clip_rect(mem[8], mem[9], mem[10], mem[11]);
-  gfx::Transform transform(mem[12], mem[16], mem[20], mem[24],
-                           mem[13], mem[17], mem[21], mem[25],
-                           mem[14], mem[18], mem[22], mem[26],
-                           mem[15], mem[19], mem[23], mem[27]);
 
   ui::CARendererLayerParams params = ui::CARendererLayerParams(
-      c.is_clipped ? true : false, gfx::ToEnclosingRect(clip_rect),
-      c.sorting_context_id, transform, image, contents_rect,
+      ca_layer_shared_state_->is_clipped, ca_layer_shared_state_->clip_rect,
+      ca_layer_shared_state_->sorting_context_id,
+      ca_layer_shared_state_->transform, image, contents_rect,
       gfx::ToEnclosingRect(bounds_rect), c.background_color, c.edge_aa_mask,
-      c.opacity, filter);
+      ca_layer_shared_state_->opacity, filter);
   if (!surface_->ScheduleCALayer(params)) {
     LOCAL_SET_GL_ERROR(GL_INVALID_OPERATION, "glScheduleCALayerCHROMIUM",
                        "failed to schedule CALayer");
   }
   return error::kNoError;
 }
 
 void GLES2DecoderImpl::DoScheduleCALayerInUseQueryCHROMIUM(
     GLsizei count,
     const GLuint* textures) {
@@ skipping 2909 matching lines @@
 
   bool is_tracing;
   TRACE_EVENT_CATEGORY_GROUP_ENABLED(TRACE_DISABLED_BY_DEFAULT("gpu.debug"),
                                      &is_tracing);
   if (is_tracing) {
     ScopedFrameBufferBinder binder(this, GetBackbufferServiceId());
     gpu_state_tracer_->TakeSnapshotWithCurrentFramebuffer(
         is_offscreen ? offscreen_size_ : surface_->GetSize());
   }
 
+  // The GL_CHROMIUM_schedule_ca_layer requires that SwapBuffers resets shared
+  // state here.
+  ca_layer_shared_state_.reset();

[piman, 2016/07/19 20:56:46]

nit: can you also add this to HandlePostSubBufferCHROMIUM and
DoCommitOverlayPlanes?

[erikchen, 2016/07/19 21:40:21]

Done.

+
   // If offscreen then don't actually SwapBuffers to the display. Just copy
   // the rendered frame to another frame buffer.
   if (is_offscreen) {
     TRACE_EVENT2("gpu", "Offscreen",
         "width", offscreen_size_.width(), "height", offscreen_size_.height());
     if (offscreen_size_ != offscreen_saved_color_texture_->size()) {
       // Workaround for NVIDIA driver bug on OS X; crbug.com/89557,
       // crbug.com/94163. TODO(kbr): figure out reproduction so Apple will
       // fix this.
       if (workarounds().needs_offscreen_buffer_workaround) {
@@ skipping 3684 matching lines @@
 }
 
 // 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 "base/macros.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h"
 
 }  // namespace gles2
 }  // namespace gpu