Use PBuffer to make TextureImageTransportSurface current.

content/common/gpu/texture_image_transport_surface.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/texture_image_transport_surface.h"
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
 #include "content/common/gpu/gl_scoped_binders.h"
 #include "content/common/gpu/gpu_channel.h"
 #include "content/common/gpu/gpu_channel_manager.h"
 #include "content/common/gpu/gpu_messages.h"
 #include "content/common/gpu/sync_point_manager.h"
 #include "content/public/common/content_switches.h"
 #include "gpu/command_buffer/service/context_group.h"
 #include "gpu/command_buffer/service/gpu_scheduler.h"
 #include "gpu/command_buffer/service/texture_manager.h"
+#include "ui/gl/gl_surface_egl.h"
 
 using gpu::gles2::ContextGroup;
 using gpu::gles2::TextureManager;
 typedef TextureManager::TextureInfo TextureInfo;
 
 TextureImageTransportSurface::Texture::Texture()
     : client_id(0),
       sent_to_client(false) {
 }
 
@@ skipping 51 matching lines @@
     texture_manager->SetParameter(
         texture.info, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
     texture_manager->SetParameter(
         texture.info, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
     texture_manager->SetParameter(
         texture.info, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
     texture_manager->SetParameter(
         texture.info, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
   }
 
-  if (!helper_->Initialize())
+  surface_ = new gfx::PbufferGLSurfaceEGL(false, gfx::Size(1, 1));

[piman, 2012/09/18 00:19:42]

This'll break because we don't have EGL on all platforms. However, I have
thought about doing something equivalent with
gfx::GLSurface::CreateOffscreenGLSurface which should work everywhere.

[no sievers, 2012/09/18 00:41:27]

Done.

+  if (!helper_->Initialize() ||
+      !surface_->Initialize())
     return false;
 
   const CommandLine* command_line = CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(switches::kUIPrioritizeInGpuProcess))
     helper_->SetPreemptByCounter(parent_channel->MessagesPendingCount());
 
   return true;
 }
 
 void TextureImageTransportSurface::Destroy() {
   if (parent_stub_) {
     parent_stub_->decoder()->MakeCurrent();
     ReleaseParentStub();
   }
 
+  if (surface_.get()) {
+    surface_->Destroy();
+    surface_ = NULL;
+  }
+
   helper_->Destroy();
 }
 
 bool TextureImageTransportSurface::Resize(const gfx::Size&) {
   return true;
 }
 
 bool TextureImageTransportSurface::IsOffscreen() {
-  return parent_stub_ ? parent_stub_->surface()->IsOffscreen() : true;
+  return true;
 }
 
 bool TextureImageTransportSurface::OnMakeCurrent(gfx::GLContext* context) {
   if (stub_destroyed_) {
     // Early-exit so that we don't recreate the fbo. We still want to return
     // true, so that the context is made current and the GLES2DecoderImpl can
     // release its own resources.
     return true;
   }
 
@@ skipping 56 matching lines @@
     if (textures_[front()].sent_to_client) {
       GpuHostMsg_AcceleratedSurfaceRelease_Params params;
       params.identifier = textures_[front()].client_id;
       helper_->SendAcceleratedSurfaceRelease(params);
       textures_[front()].sent_to_client = false;
     }
   }
 }
 
 void* TextureImageTransportSurface::GetShareHandle() {
   return GetHandle();

[no sievers, 2012/09/18 00:17:01]

Is this only used on Windows?
Should this do NOTREACHED() and return NULL?

 }
 
 void* TextureImageTransportSurface::GetDisplay() {
-  return parent_stub_ ? parent_stub_->surface()->GetDisplay() : NULL;
+  return surface_.get() ? surface_->GetDisplay() : NULL;
 }
 
 void* TextureImageTransportSurface::GetConfig() {
-  return parent_stub_ ? parent_stub_->surface()->GetConfig() : NULL;
+  return surface_.get() ? surface_->GetConfig() : NULL;
 }
 
 void TextureImageTransportSurface::OnResize(gfx::Size size) {
   CreateBackTexture(size);
 }
 
 void TextureImageTransportSurface::OnWillDestroyStub(
     GpuCommandBufferStub* stub) {
   if (stub == parent_stub_) {
     ReleaseParentStub();
@@ skipping 117 matching lines @@
 
 gfx::Size TextureImageTransportSurface::GetSize() {
   gfx::Size size = textures_[back()].size;
 
   // OSMesa expects a non-zero size.
   return gfx::Size(size.width() == 0 ? 1 : size.width(),
                    size.height() == 0 ? 1 : size.height());
 }
 
 void* TextureImageTransportSurface::GetHandle() {
-  return parent_stub_ ? parent_stub_->surface()->GetHandle() : NULL;
+  return surface_.get() ? surface_->GetHandle() : NULL;
 }
 
 unsigned TextureImageTransportSurface::GetFormat() {
-  return parent_stub_ ? parent_stub_->surface()->GetFormat() : 0;
+  return surface_ ? surface_->GetFormat() : 0;
 }
 
 void TextureImageTransportSurface::OnSetFrontSurfaceIsProtected(
     bool is_protected, uint32 protection_state_id) {
   protection_state_id_ = protection_state_id;
   if (frontbuffer_is_protected_ == is_protected)
     return;
   frontbuffer_is_protected_ = is_protected;
   AdjustFrontBufferAllocation();
 
@@ skipping 153 matching lines @@
     Texture& texture = textures_[i];
     texture.info = NULL;
     if (!texture.sent_to_client)
       continue;
     GpuHostMsg_AcceleratedSurfaceRelease_Params params;
     params.identifier = texture.client_id;
     helper_->SendAcceleratedSurfaceRelease(params);
   }
   parent_stub_ = NULL;
 }