ozone: Implement zero/one-copy texture for Ozone GBM.

cc/resources/resource_provider.cc

 // Copyright 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 "cc/resources/resource_provider.h"
 
 #include <algorithm>
 #include <limits>
 
 #include "base/containers/hash_tables.h"
@@ skipping 939 matching lines @@
   resource_provider_->UnlockForWrite(resource_);
   if (!gpu_memory_buffer_)
     return;
 
   resource_provider_->LazyCreate(resource_);
 
   if (!resource_->image_id) {
     GLES2Interface* gl = resource_provider_->ContextGL();
     DCHECK(gl);
 
-#if defined(OS_CHROMEOS)

[reveman, 2015/06/25 14:07:51]

we should just remove this. if there are still performance issues with using
fences then we need to solve them.

-    // TODO(reveman): GL_COMMANDS_ISSUED_CHROMIUM is used for synchronization
-    // on ChromeOS to avoid some performance issues. This only works with
-    // shared memory backed buffers. crbug.com/436314
-    DCHECK_EQ(gpu_memory_buffer_->GetHandle().type, gfx::SHARED_MEMORY_BUFFER);
-#endif
-
     resource_->image_id = gl->CreateImageCHROMIUM(
         gpu_memory_buffer_->AsClientBuffer(), size_.width(), size_.height(),
         GLInternalFormat(resource_->format));
   }
 
   std::swap(resource_->gpu_memory_buffer, gpu_memory_buffer_);
   resource_->allocated = true;
   resource_->dirty_image = true;
 
   // GpuMemoryBuffer provides direct access to the memory used by the GPU.
@@ skipping 881 matching lines @@
   GLES2Interface* gl = ContextGL();
   DCHECK(gl);
   if (source_resource->image_id && source_resource->dirty_image) {
     gl->BindTexture(source_resource->target, source_resource->gl_id);
     BindImageForSampling(source_resource);
   }
   if (use_sync_query_) {
     if (!source_resource->gl_read_lock_query_id)
       gl->GenQueriesEXT(1, &source_resource->gl_read_lock_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,
-                      source_resource->gl_read_lock_query_id);
-#else
+    // TODO(reveman): GL_COMMANDS_ISSUED_CHROMIUM is used for synchronization
+    // on ChromeOS to avoid some performance issues. This only works with
+    // shared memory backed buffers. crbug.com/436314
+    if (source_resource->gpu_memory_buffer->GetHandle().type ==
+        gfx::SHARED_MEMORY_BUFFER)
+      gl->BeginQueryEXT(GL_COMMANDS_ISSUED_CHROMIUM,
+                        source_resource->gl_read_lock_query_id);
+    else

[dshwang, 2015/06/25 14:52:13]

This quirk is for ARM ChromeOS perf issue.
After this CL, only SHARED_MEMORY_BUFFER on ChromeOS uses this quirk. If native
memory buffer is enabled, GL_COMMANDS_COMPLETED_CHROMIUM is used for
correctness.

If you think this quirk is not needed anymore, I'll remove it in another
(prerequisite) CL.

+#endif
     gl->BeginQueryEXT(GL_COMMANDS_COMPLETED_CHROMIUM,
                       source_resource->gl_read_lock_query_id);
-#endif
   }
   DCHECK(!dest_resource->image_id);
   dest_resource->allocated = true;
   gl->CopySubTextureCHROMIUM(dest_resource->target, source_resource->gl_id,
                              dest_resource->gl_id, rect.x(), rect.y(), rect.x(),
                              rect.y(), rect.width(), rect.height(),
                              false, false, false);
   if (source_resource->gl_read_lock_query_id) {
     // End query and create a read lock fence that will prevent access to
 // source resource until CopySubTextureCHROMIUM command has completed.
 #if defined(OS_CHROMEOS)
-    gl->EndQueryEXT(GL_COMMANDS_ISSUED_CHROMIUM);
-#else
-    gl->EndQueryEXT(GL_COMMANDS_COMPLETED_CHROMIUM);
+    if (source_resource->gpu_memory_buffer->GetHandle().type ==
+        gfx::SHARED_MEMORY_BUFFER)
+      gl->EndQueryEXT(GL_COMMANDS_ISSUED_CHROMIUM);
+    else
 #endif
+      gl->EndQueryEXT(GL_COMMANDS_COMPLETED_CHROMIUM);
     source_resource->read_lock_fence = make_scoped_refptr(
         new CopyTextureFence(gl, source_resource->gl_read_lock_query_id));
   } else {
     // Create a SynchronousFence when CHROMIUM_sync_query extension is missing.
     // Try to use one synchronous fence for as many CopyResource operations as
     // possible as that reduce the number of times we have to synchronize with
     // the GL.
     if (!synchronous_fence_.get() || synchronous_fence_->has_synchronized())
       synchronous_fence_ = make_scoped_refptr(new SynchronousFence(gl));
     source_resource->read_lock_fence = synchronous_fence_;
@@ skipping 43 matching lines @@
 }
 
 class GrContext* ResourceProvider::GrContext(bool worker_context) const {
   ContextProvider* context_provider =
       worker_context ? output_surface_->worker_context_provider()
                      : output_surface_->context_provider();
   return context_provider ? context_provider->GrContext() : NULL;
 }
 
 }  // namespace cc