Add a new command buffer function glScheduleCALayerInUseQueryCHROMIUM.

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 10430 matching lines @@
   if (!surface_->ScheduleCALayer(
           image, contents_rect, c.opacity, c.background_color, c.edge_aa_mask,
           bounds_rect, c.is_clipped ? true : false, clip_rect, transform,
           c.sorting_context_id, filter)) {
     LOCAL_SET_GL_ERROR(GL_INVALID_OPERATION, "glScheduleCALayerCHROMIUM",
                        "failed to schedule CALayer");
   }
   return error::kNoError;
 }
 
+error::Error GLES2DecoderImpl::HandleScheduleCALayerInUseQueryCHROMIUMImmediate(
+    uint32_t immediate_data_size,
+    const void* cmd_data) {
+  const gles2::cmds::ScheduleCALayerInUseQueryCHROMIUMImmediate& c =
+      *static_cast<
+          const gles2::cmds::ScheduleCALayerInUseQueryCHROMIUMImmediate*>(
+          cmd_data);
+
+  GLuint n = static_cast<GLuint>(c.n);
+  uint32_t data_size;
+  if (!GLES2Util::ComputeDataSize(n, sizeof(GLuint), 1, &data_size)) {
+    return error::kOutOfBounds;
+  }
+  if (data_size > immediate_data_size) {
+    return error::kOutOfBounds;
+  }
+  const GLuint* textures =
+      GetImmediateDataAs<const GLuint*>(c, data_size, immediate_data_size);

[piman, 2016/06/14 00:58:56]

On the client side, you transmits the textures into a side transfer buffer,
whereas here you read them from the command buffer, so I think one of them is
wrong :)

[erikchen, 2016/06/14 01:47:51]

This code is no longer necessary, because I now use PUTn type.

+
+  std::vector<gl::GLSurface::CALayerInUseQuery> queries;

[piman, 2016/06/14 00:58:55]

nit: queries.reserve(n); to avoid reallocations

[erikchen, 2016/06/14 01:47:51]

Done.

+  for (unsigned i = 0; i < n; ++i) {
+    gl::GLImage* image = nullptr;
+    GLuint texture_id = textures[i];
+    if (texture_id) {
+      TextureRef* ref = texture_manager()->GetTexture(texture_id);
+      if (!ref) {
+        LOCAL_SET_GL_ERROR(GL_INVALID_VALUE,
+                           "glScheduleCALayerInUseQueryCHROMIUM",
+                           "unknown texture");
+        return error::kNoError;
+      }
+      Texture::ImageState image_state;
+      image = ref->texture()->GetLevelImage(ref->texture()->target(), 0,
+                                            &image_state);
+    }
+    gl::GLSurface::CALayerInUseQuery query;
+    query.image = image;
+    query.texture = texture_id;
+    queries.push_back(query);
+  }
+
+  surface_->ScheduleCALayerInUseQuery(queries);

[piman, 2016/06/14 00:58:55]

nit: std::move(queries)

[erikchen, 2016/06/14 01:47:51]

Done.

+  return error::kNoError;
+}
+
 error::Error GLES2DecoderImpl::GetAttribLocationHelper(
     GLuint client_id,
     uint32_t location_shm_id,
     uint32_t location_shm_offset,
     const std::string& name_str) {
   if (!StringIsValidForGLES(name_str)) {
     LOCAL_SET_GL_ERROR(
         GL_INVALID_VALUE, "glGetAttribLocation", "Invalid character");
     return error::kNoError;
   }
@@ skipping 6423 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