cc: Fix support for RGBA4444 texture format and one-copy.

cc/raster/one_copy_tile_task_worker_pool.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_tile_task_worker_pool.h"
 
 #include <algorithm>
 #include <limits>
 
 #include "base/strings/stringprintf.h"
@@ skipping 358 matching lines @@
 
   {
     base::AutoUnlock unlock(lock_);
 
     // Allocate GpuMemoryBuffer if necessary.
     if (!staging_buffer->gpu_memory_buffer) {
       staging_buffer->gpu_memory_buffer =
           resource_provider_->gpu_memory_buffer_manager()
               ->AllocateGpuMemoryBuffer(
                   staging_buffer->size,
-                  BufferFormat(resource_provider_->best_texture_format()),
+                  BufferFormat(
+                      resource_provider_->memory_efficient_texture_format()),
                   use_persistent_gpu_memory_buffers_
                       ? gfx::BufferUsage::PERSISTENT_MAP
                       : gfx::BufferUsage::MAP);
       DCHECK_EQ(gfx::NumberOfPlanesForBufferFormat(
                     staging_buffer->gpu_memory_buffer->GetFormat()),
                 1u);
     }
 
     gfx::Rect playback_rect = raster_full_rect;
     if (use_persistent_gpu_memory_buffers_ && previous_content_id) {
       // Reduce playback rect to dirty region if the content id of the staging
       // buffer matches the prevous content id.
       if (previous_content_id == staging_buffer->content_id)
         playback_rect.Intersect(raster_dirty_rect);
     }
 
     if (staging_buffer->gpu_memory_buffer) {
       void* data = nullptr;
       bool rv = staging_buffer->gpu_memory_buffer->Map(&data);
       DCHECK(rv);
       int stride;
       staging_buffer->gpu_memory_buffer->GetStride(&stride);
       // TileTaskWorkerPool::PlaybackToMemory only supports unsigned strides.
       DCHECK_GE(stride, 0);
 
       DCHECK(!playback_rect.IsEmpty())
           << "Why are we rastering a tile that's not dirty?";
       TileTaskWorkerPool::PlaybackToMemory(
-          data, resource_provider_->best_texture_format(), staging_buffer->size,
-          static_cast<size_t>(stride), raster_source, raster_full_rect,
-          playback_rect, scale, include_images);
+          data, resource_provider_->memory_efficient_texture_format(),
+          staging_buffer->size, static_cast<size_t>(stride), raster_source,
+          raster_full_rect, playback_rect, scale, include_images);
       staging_buffer->gpu_memory_buffer->Unmap();
       staging_buffer->content_id = new_content_id;
     }
   }
 
   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);
 
     unsigned image_target = resource_provider_->GetImageTextureTarget(
-        resource_provider_->best_texture_format());
+        resource_provider_->memory_efficient_texture_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);
       gl->TexParameteri(image_target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
     } else {
       gl->BindTexture(image_target, staging_buffer->texture_id);
     }
 
     // Create and bind image.
     if (!staging_buffer->image_id) {
       if (staging_buffer->gpu_memory_buffer) {
         staging_buffer->image_id = gl->CreateImageCHROMIUM(
             staging_buffer->gpu_memory_buffer->AsClientBuffer(),
             staging_buffer->size.width(), staging_buffer->size.height(),
-            GLInternalFormat(resource_provider_->best_texture_format()));
+            GLInternalFormat(
+                resource_provider_->memory_efficient_texture_format()));
         gl->BindTexImage2DCHROMIUM(image_target, staging_buffer->image_id);
       }
     } else {
       gl->ReleaseTexImage2DCHROMIUM(image_target, staging_buffer->image_id);
       gl->BindTexImage2DCHROMIUM(image_target, staging_buffer->image_id);
     }
 
     // Unbind staging texture.
     gl->BindTexture(image_target, 0);
 
     if (resource_provider_->use_sync_query()) {
       if (!staging_buffer->query_id)
         gl->GenQueriesEXT(1, &staging_buffer->query_id);
 
 #if defined(OS_CHROMEOS)
       // TODO(reveman): This avoids a performance problem on some ChromeOS
       // devices. This needs to be removed to support native GpuMemoryBuffer
       // implementations. crbug.com/436314
       gl->BeginQueryEXT(GL_COMMANDS_ISSUED_CHROMIUM, staging_buffer->query_id);
 #else
       gl->BeginQueryEXT(GL_COMMANDS_COMPLETED_CHROMIUM,
                         staging_buffer->query_id);
 #endif
     }
 
     int bytes_per_row =
-        (BitsPerPixel(resource_provider_->best_texture_format()) *
+        (BitsPerPixel(resource_provider_->memory_efficient_texture_format()) *
          resource->size().width()) /
         8;
     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|.
@@ skipping 33 matching lines @@
 
   ScheduleReduceMemoryUsage();
 }
 
 bool OneCopyTileTaskWorkerPool::OnMemoryDump(
     const base::trace_event::MemoryDumpArgs& args,
     base::trace_event::ProcessMemoryDump* pmd) {
   base::AutoLock lock(lock_);
 
   for (const auto& buffer : buffers_) {
-    buffer->OnMemoryDump(pmd, resource_provider_->best_texture_format(),
+    buffer->OnMemoryDump(pmd,
+                         resource_provider_->memory_efficient_texture_format(),
                          std::find(free_buffers_.begin(), free_buffers_.end(),
                                    buffer) != free_buffers_.end());
   }
 
   return true;
 }
 
 scoped_ptr<OneCopyTileTaskWorkerPool::StagingBuffer>
 OneCopyTileTaskWorkerPool::AcquireStagingBuffer(const Resource* resource,
                                                 uint64_t previous_content_id) {
@@ skipping 205 matching lines @@
 
   staging_state->SetInteger("staging_buffer_count",
                             static_cast<int>(buffers_.size()));
   staging_state->SetInteger("busy_count",
                             static_cast<int>(busy_buffers_.size()));
   staging_state->SetInteger("free_count",
                             static_cast<int>(free_buffers_.size()));
 }
 
 }  // namespace cc