cc: Add mailbox support to ResourceProvider write locks.

cc/raster/one_copy_raster_buffer_provider.cc

 // Copyright 2014 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 "cc/raster/one_copy_raster_buffer_provider.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 #include <limits>
@@ skipping 13 matching lines @@
 
 namespace cc {
 namespace {
 
 class RasterBufferImpl : public RasterBuffer {
  public:
   RasterBufferImpl(OneCopyRasterBufferProvider* worker_pool,
                    ResourceProvider* resource_provider,
                    ResourceFormat resource_format,
                    const Resource* resource,
-                   uint64_t previous_content_id)
+                   uint64_t previous_content_id,
+                   bool use_mailbox)
       : worker_pool_(worker_pool),
         resource_(resource),
-        lock_(resource_provider, resource->id()),
+        lock_(resource_provider, resource->id(), use_mailbox),
         previous_content_id_(previous_content_id) {}
 
   ~RasterBufferImpl() override {}
 
   // Overridden from RasterBuffer:
   void Playback(
       const RasterSource* raster_source,
       const gfx::Rect& raster_full_rect,
       const gfx::Rect& raster_dirty_rect,
       uint64_t new_content_id,
@@ skipping 20 matching lines @@
 }  // namespace
 
 // static
 std::unique_ptr<RasterBufferProvider> OneCopyRasterBufferProvider::Create(
     base::SequencedTaskRunner* task_runner,
     ContextProvider* context_provider,
     ResourceProvider* resource_provider,
     int max_copy_texture_chromium_size,
     bool use_partial_raster,
     int max_staging_buffer_usage_in_bytes,
-    ResourceFormat preferred_tile_format) {
+    ResourceFormat preferred_tile_format,
+    bool async_worker_context_enabled) {
   return base::WrapUnique<RasterBufferProvider>(new OneCopyRasterBufferProvider(
       task_runner, resource_provider, max_copy_texture_chromium_size,
       use_partial_raster, max_staging_buffer_usage_in_bytes,
-      preferred_tile_format));
+      preferred_tile_format, async_worker_context_enabled));
 }
 
 OneCopyRasterBufferProvider::OneCopyRasterBufferProvider(
     base::SequencedTaskRunner* task_runner,
     ResourceProvider* resource_provider,
     int max_copy_texture_chromium_size,
     bool use_partial_raster,
     int max_staging_buffer_usage_in_bytes,
-    ResourceFormat preferred_tile_format)
+    ResourceFormat preferred_tile_format,
+    bool async_worker_context_enabled)
     : resource_provider_(resource_provider),
       max_bytes_per_copy_operation_(
           max_copy_texture_chromium_size
               ? std::min(kMaxBytesPerCopyOperation,
                          max_copy_texture_chromium_size)
               : kMaxBytesPerCopyOperation),
       use_partial_raster_(use_partial_raster),
       bytes_scheduled_since_last_flush_(0),
-      preferred_tile_format_(preferred_tile_format) {
+      preferred_tile_format_(preferred_tile_format),
+      async_worker_context_enabled_(async_worker_context_enabled) {
   staging_pool_ = StagingBufferPool::Create(task_runner, resource_provider,
                                             use_partial_raster,
                                             max_staging_buffer_usage_in_bytes);
 }
 
 OneCopyRasterBufferProvider::~OneCopyRasterBufferProvider() {}
 
 std::unique_ptr<RasterBuffer>
 OneCopyRasterBufferProvider::AcquireBufferForRaster(
     const Resource* resource,
     uint64_t resource_content_id,
     uint64_t previous_content_id) {
   // TODO(danakj): If resource_content_id != 0, we only need to copy/upload
   // the dirty rect.
-  return base::WrapUnique<RasterBuffer>(
-      new RasterBufferImpl(this, resource_provider_, resource->format(),
-                           resource, previous_content_id));
+  return base::WrapUnique<RasterBuffer>(new RasterBufferImpl(
+      this, resource_provider_, resource->format(), resource,
+      previous_content_id, async_worker_context_enabled_));
 }
 
 void OneCopyRasterBufferProvider::ReleaseBufferForRaster(
     std::unique_ptr<RasterBuffer> buffer) {
   // Nothing to do here. RasterBufferImpl destructor cleans up after itself.
 }
 
 void OneCopyRasterBufferProvider::OrderingBarrier() {
   TRACE_EVENT0("cc", "OneCopyRasterBufferProvider::OrderingBarrier");
 
-  resource_provider_->output_surface()
-      ->context_provider()
-      ->ContextGL()
-      ->OrderingBarrierCHROMIUM();
+  gpu::gles2::GLES2Interface* gl =
+      resource_provider_->output_surface()->context_provider()->ContextGL();
+
+  GLuint64 fence = gl->InsertFenceSyncCHROMIUM();
+  gl->OrderingBarrierCHROMIUM();
+  gl->GenUnverifiedSyncTokenCHROMIUM(fence, sync_token_.GetData());
 }
 
 ResourceFormat OneCopyRasterBufferProvider::GetResourceFormat(
     bool must_support_alpha) const {
   if (resource_provider_->IsResourceFormatSupported(preferred_tile_format_) &&
       (DoesResourceFormatSupportAlpha(preferred_tile_format_) ||
        !must_support_alpha)) {
     return preferred_tile_format_;
   }
 
@@ skipping 94 matching lines @@
   ContextProvider* context_provider =
       resource_provider_->output_surface()->worker_context_provider();
   DCHECK(context_provider);
 
   {
     ContextProvider::ScopedContextLock scoped_context(context_provider);
 
     gpu::gles2::GLES2Interface* gl = scoped_context.ContextGL();
     DCHECK(gl);
 
+    // Synchronize with compositor.
+    DCHECK(sync_token_.HasData());
+    gl->WaitSyncTokenCHROMIUM(sync_token_.GetConstData());
+
+    unsigned resource_texture_id = resource_lock->ProduceTextureId();
     unsigned image_target =
         resource_provider_->GetImageTextureTarget(resource->format());
 
     // Create and bind staging texture.
     if (!staging_buffer->texture_id) {
       gl->GenTextures(1, &staging_buffer->texture_id);
       gl->BindTexture(image_target, staging_buffer->texture_id);
       gl->TexParameteri(image_target, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
       gl->TexParameteri(image_target, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
       gl->TexParameteri(image_target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
@@ skipping 30 matching lines @@
 #else
       gl->BeginQueryEXT(GL_COMMANDS_COMPLETED_CHROMIUM,
                         staging_buffer->query_id);
 #endif
     }
 
     // Since compressed texture's cannot be pre-allocated we might have an
     // unallocated resource in which case we need to perform a full size copy.
     if (IsResourceFormatCompressed(resource->format())) {
       gl->CompressedCopyTextureCHROMIUM(staging_buffer->texture_id,
-                                        resource_lock->texture_id());
+                                        resource_texture_id);
     } else {
       int bytes_per_row = ResourceUtil::UncheckedWidthInBytes<int>(
           resource->size().width(), resource->format());
       int chunk_size_in_rows =
           std::max(1, max_bytes_per_copy_operation_ / bytes_per_row);
       // Align chunk size to 4. Required to support compressed texture formats.
       chunk_size_in_rows = MathUtil::UncheckedRoundUp(chunk_size_in_rows, 4);
       int y = 0;
       int height = resource->size().height();
       while (y < height) {
         // Copy at most |chunk_size_in_rows|.
         int rows_to_copy = std::min(chunk_size_in_rows, height - y);
         DCHECK_GT(rows_to_copy, 0);
 
         gl->CopySubTextureCHROMIUM(
-            staging_buffer->texture_id, resource_lock->texture_id(), 0, y, 0, y,
+            staging_buffer->texture_id, resource_texture_id, 0, y, 0, y,
             resource->size().width(), rows_to_copy, false, false, false);
         y += rows_to_copy;
 
         // Increment |bytes_scheduled_since_last_flush_| by the amount of memory
         // used for this copy operation.
         bytes_scheduled_since_last_flush_ += rows_to_copy * bytes_per_row;
 
         if (bytes_scheduled_since_last_flush_ >=
             max_bytes_per_copy_operation_) {
           gl->ShallowFlushCHROMIUM();
           bytes_scheduled_since_last_flush_ = 0;
         }
       }
     }
 
     if (resource_provider_->use_sync_query()) {
 #if defined(OS_CHROMEOS) && defined(ARCH_CPU_ARM_FAMILY)
       gl->EndQueryEXT(GL_COMMANDS_ISSUED_CHROMIUM);
 #else
       gl->EndQueryEXT(GL_COMMANDS_COMPLETED_CHROMIUM);
 #endif
     }
 
+    resource_lock->ReleaseTextureId();
+
     const uint64_t fence_sync = gl->InsertFenceSyncCHROMIUM();
 
     // Barrier to sync worker context output to cc context.
     gl->OrderingBarrierCHROMIUM();
 
     // Generate sync token after the barrier for cross context synchronization.
     gpu::SyncToken sync_token;
     gl->GenUnverifiedSyncTokenCHROMIUM(fence_sync, sync_token.GetData());
     resource_lock->UpdateResourceSyncToken(sync_token);
   }
 }
 
 }  // namespace cc