gpu: Add support for GLX_EXT_texture_from_pixmap extension.

content/common/gpu/gpu_channel_manager.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 "content/common/gpu/gpu_channel_manager.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "content/common/child_thread.h"
 #include "content/common/gpu/gpu_channel.h"
@@ skipping 12 matching lines @@
                                      base::MessageLoopProxy* io_message_loop,
                                      base::WaitableEvent* shutdown_event)
     : ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)),
       io_message_loop_(io_message_loop),
       shutdown_event_(shutdown_event),
       gpu_child_thread_(gpu_child_thread),
       ALLOW_THIS_IN_INITIALIZER_LIST(gpu_memory_manager_(this,
           GpuMemoryManager::kDefaultMaxSurfacesWithFrontbufferSoftLimit)),
       watchdog_(watchdog),
       sync_point_manager_(new SyncPointManager),
-      program_cache_(NULL) {
+      program_cache_(NULL),
+      image_sync_point_(0) {
   DCHECK(gpu_child_thread);
   DCHECK(io_message_loop);
   DCHECK(shutdown_event);
 }
 
 GpuChannelManager::~GpuChannelManager() {
   gpu_channels_.clear();
   if (default_offscreen_surface_.get()) {
     default_offscreen_surface_->Destroy();
     default_offscreen_surface_ = NULL;
@@ skipping 44 matching lines @@
 }
 
 bool GpuChannelManager::OnMessageReceived(const IPC::Message& msg) {
   bool msg_is_ok = true;
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP_EX(GpuChannelManager, msg, msg_is_ok)
     IPC_MESSAGE_HANDLER(GpuMsg_EstablishChannel, OnEstablishChannel)
     IPC_MESSAGE_HANDLER(GpuMsg_CloseChannel, OnCloseChannel)
     IPC_MESSAGE_HANDLER(GpuMsg_CreateViewCommandBuffer,
                         OnCreateViewCommandBuffer)
+    IPC_MESSAGE_HANDLER(GpuMsg_CreateImage, OnCreateImage)
+    IPC_MESSAGE_HANDLER(GpuMsg_DeleteImage, OnDeleteImage)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP_EX()
   return handled;
 }
 
 bool GpuChannelManager::Send(IPC::Message* msg) {
   return gpu_child_thread_->Send(msg);
 }
 
 void GpuChannelManager::OnEstablishChannel(int client_id, bool share_context) {
@@ skipping 54 matching lines @@
 
   GpuChannelMap::const_iterator iter = gpu_channels_.find(client_id);
   if (iter != gpu_channels_.end()) {
     iter->second->CreateViewCommandBuffer(
         window, surface_id, init_params, &route_id);
   }
 
   Send(new GpuHostMsg_CommandBufferCreated(route_id));
 }
 
+void GpuChannelManager::OnCreateImageSyncPointRetired(
+    gfx::PluginWindowHandle window,
+    int32 client_id,
+    int32 image_id) {
+  gfx::Size size;
+
+  GpuChannelMap::const_iterator iter = gpu_channels_.find(client_id);
+  if (iter != gpu_channels_.end()) {
+    iter->second->CreateImage(window, image_id, &size);
+  }
+
+  Send(new GpuHostMsg_ImageCreated(size));
+}
+
+void GpuChannelManager::OnCreateImage(
+    gfx::PluginWindowHandle window,
+    int32 client_id,
+    int32 image_id) {
+  DCHECK(image_id);
+
+  if (image_sync_point_)

[piman, 2012/10/13 18:00:38]

I'm not convinced :)
It's possible - at least in theory - that the client would create 2 sync points,
but call DeleteImage on sync points in opposite order:

sync_point1 = context->insertSyncPoint();
[...]
sync_point2 = context->insertSyncPoint();
[...]
DeleteImage(id1, sync_point2);
DeleteImage(id2, sync_point1);
[...]
CreateImage(XID, id1, callback);

In this case, image_sync_point_ will be sync_point1, and you won't be waiting on
sync_point2 (if that's what you were trying to do).

[reveman, 2012/10/17 07:37:11]

Latest patch puts all image ops in a queue and pops ops off the queue until an
op with a pending sync point is reached.

+    sync_point_manager()->AddSyncPointCallback(
+        image_sync_point_,
+        base::Bind(&GpuChannelManager::OnCreateImageSyncPointRetired,
+                   base::Unretained(this),
+                   window,
+                   client_id,
+                   image_id));
+  else
+    OnCreateImageSyncPointRetired(window, client_id, image_id);
+}
+
+void GpuChannelManager::OnDeleteImageSyncPointRetired(
+    int32 client_id,
+    int32 image_id) {
+  GpuChannelMap::const_iterator iter = gpu_channels_.find(client_id);
+  if (iter != gpu_channels_.end()) {
+    iter->second->DeleteImage(image_id);
+  }
+}
+
+void GpuChannelManager::OnDeleteImage(
+    int32 client_id,
+    int32 image_id,
+    int32 sync_point) {
+  DCHECK(image_id);
+
+  if (sync_point)
+    image_sync_point_ = sync_point;
+
+  if (image_sync_point_)

[piman, 2012/10/13 18:00:38]

nit: style requires braces (on both clauses) when one clause takes more than one
line.

[reveman, 2012/10/17 07:37:11]

Done.

+    sync_point_manager()->AddSyncPointCallback(
+        sync_point,
+        base::Bind(&GpuChannelManager::OnDeleteImageSyncPointRetired,
+                   base::Unretained(this),
+                   client_id,
+                   image_id));
+  else
+    OnDeleteImageSyncPointRetired(client_id, image_id);
+}
+
 void GpuChannelManager::LoseAllContexts() {
   MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(&GpuChannelManager::OnLoseAllContexts,
                  weak_factory_.GetWeakPtr()));
 }
 
 void GpuChannelManager::OnLoseAllContexts() {
   gpu_channels_.clear();
 }
 
 gfx::GLSurface* GpuChannelManager::GetDefaultOffscreenSurface() {
   if (!default_offscreen_surface_.get()) {
     default_offscreen_surface_ = gfx::GLSurface::CreateOffscreenGLSurface(
         false, gfx::Size(1, 1));
   }
   return default_offscreen_surface_.get();
 }