Scan-out capable buffers (aka ui::NativePixmap) for Mus

components/mus/gles2/command_buffer_local.cc

 // Copyright 2015 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 "components/mus/gles2/command_buffer_local.h"
 
 #include "base/atomic_sequence_num.h"
 #include "base/bind.h"
 #include "base/memory/shared_memory.h"
 #include "base/synchronization/waitable_event.h"
@@ skipping 215 matching lines @@
                                         size_t height,
                                         unsigned internal_format) {
   DCHECK(CalledOnValidThread());
   int32_t new_id = ++next_image_id_;
   mojo::SizePtr size = mojo::Size::New();
   size->width = static_cast<int32_t>(width);
   size->height = static_cast<int32_t>(height);
 
   mus::MojoGpuMemoryBufferImpl* gpu_memory_buffer =
       mus::MojoGpuMemoryBufferImpl::FromClientBuffer(buffer);
-  gfx::GpuMemoryBufferHandle handle = gpu_memory_buffer->GetHandle();
 
   bool requires_sync_point = false;
-  if (handle.type != gfx::SHARED_MEMORY_BUFFER) {
-    requires_sync_point = true;
+
+  if (gpu_memory_buffer->GetBufferType() == gfx::SHARED_MEMORY_BUFFER) {
+    gfx::GpuMemoryBufferHandle handle = gpu_memory_buffer->GetHandle();
+    base::SharedMemoryHandle dupd_handle =
+        base::SharedMemory::DuplicateHandle(handle.handle);

[Fady Samuel, 2016/04/06 22:02:02]

I don't think we need this. Please add a TODO to verify?

[rjkroege, 2016/04/06 22:45:45]

Done.

+#if defined(OS_WIN)
+    HANDLE platform_handle = dupd_handle.GetHandle();
+#else
+    int platform_handle = dupd_handle.fd;
+#endif
+
+    MojoHandle mojo_handle = MOJO_HANDLE_INVALID;
+    MojoResult create_result =
+        MojoCreatePlatformHandleWrapper(platform_handle, &mojo_handle);
+    // |MojoCreatePlatformHandleWrapper()| always takes the ownership of the
+    // |platform_handle|, so we don't need to close |platform_handle|.
+    if (create_result != MOJO_RESULT_OK) {
+      NOTIMPLEMENTED();
+      return -1;
+    }
+    mojo::ScopedHandle scoped_handle;
+    scoped_handle.reset(mojo::Handle(mojo_handle));
+
+    const int32_t format = static_cast<int32_t>(gpu_memory_buffer->GetFormat());
+    gpu_state_->command_buffer_task_runner()->PostTask(
+        driver_.get(),
+        base::Bind(&CommandBufferLocal::CreateImageOnGpuThread,
+                   base::Unretained(this), new_id, base::Passed(&scoped_handle),
+                   handle.type, base::Passed(&size), format, internal_format));
+  } else if (gpu_memory_buffer->GetBufferType() == gfx::OZONE_NATIVE_PIXMAP) {
+    gpu_state_->command_buffer_task_runner()->PostTask(
+        driver_.get(),
+        base::Bind(&CommandBufferLocal::CreateImageNativeOzoneOnGpuThread,
+                   base::Unretained(this), new_id,
+                   gpu_memory_buffer->GetBufferType(),
+                   gpu_memory_buffer->GetSize(), gpu_memory_buffer->GetFormat(),
+                   internal_format,
+                   base::RetainedRef(gpu_memory_buffer->GetNativePixmap())));
+
+  } else {
     NOTIMPLEMENTED();
     return -1;
   }
 
-  base::SharedMemoryHandle dupd_handle =
-      base::SharedMemory::DuplicateHandle(handle.handle);
-#if defined(OS_WIN)
-  HANDLE platform_handle = dupd_handle.GetHandle();
-#else
-  int platform_handle = dupd_handle.fd;
-#endif
-
-  MojoHandle mojo_handle = MOJO_HANDLE_INVALID;
-  MojoResult create_result =
-      MojoCreatePlatformHandleWrapper(platform_handle, &mojo_handle);
-  // |MojoCreatePlatformHandleWrapper()| always takes the ownership of the
-  // |platform_handle|, so we don't need close |platform_handle|.
-  if (create_result != MOJO_RESULT_OK) {
-    NOTIMPLEMENTED();
-    return -1;
-  }
-  mojo::ScopedHandle scoped_handle;
-  scoped_handle.reset(mojo::Handle(mojo_handle));
-
-  const int32_t format = static_cast<int32_t>(gpu_memory_buffer->GetFormat());
-  gpu_state_->command_buffer_task_runner()->PostTask(
-      driver_.get(),
-      base::Bind(&CommandBufferLocal::CreateImageOnGpuThread,
-                 base::Unretained(this), new_id, base::Passed(&scoped_handle),
-                 handle.type, base::Passed(&size), format, internal_format));
-
   if (requires_sync_point) {
-    NOTIMPLEMENTED();
+    NOTIMPLEMENTED() << "Require sync points";
     // TODO(jam): need to support this if we support types other than
     // SHARED_MEMORY_BUFFER.
     // gpu_memory_buffer_manager->SetDestructionSyncPoint(gpu_memory_buffer,
     // InsertSyncPoint());
   }
 
   return new_id;
 }
 
 void CommandBufferLocal::DestroyImage(int32_t id) {
@@ skipping 220 matching lines @@
     int32_t type,
     mojo::SizePtr size,
     int32_t format,
     int32_t internal_format) {
   DCHECK(driver_->IsScheduled());
   driver_->CreateImage(id, std::move(memory_handle), type, std::move(size),
                        format, internal_format);
   return true;
 }
 
+bool CommandBufferLocal::CreateImageNativeOzoneOnGpuThread(
+    int32_t id,
+    int32_t type,
+    gfx::Size size,
+    gfx::BufferFormat format,
+    uint32_t internal_format,
+    ui::NativePixmap* pixmap) {
+  DCHECK(driver_->IsScheduled());
+  driver_->CreateImageNativeOzone(id, type, size, format, internal_format,
+                                  pixmap);
+  return true;
+}
+
 bool CommandBufferLocal::DestroyImageOnGpuThread(int32_t id) {
   DCHECK(driver_->IsScheduled());
   driver_->DestroyImage(id);
   return true;
 }
 
 bool CommandBufferLocal::MakeProgressOnGpuThread(
     base::WaitableEvent* event,
     gpu::CommandBuffer::State* state) {
   DCHECK(driver_->IsScheduled());
@@ skipping 27 matching lines @@
     client_->UpdateVSyncParameters(timebase, interval);
 }
 
 void CommandBufferLocal::OnGpuCompletedSwapBuffersOnClientThread(
     gfx::SwapResult result) {
   if (client_)
     client_->GpuCompletedSwapBuffers(result);
 }
 
 }  // namespace mus