Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2131)

Unified Diff: content/common/gpu/image_transport_surface_mac.cc

Issue 334173006: Clean up GLSurfaceCGL (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Incorporate review feedback Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/common/gpu/image_transport_surface_mac.cc
diff --git a/content/common/gpu/image_transport_surface_mac.cc b/content/common/gpu/image_transport_surface_mac.cc
deleted file mode 100644
index 8341716613f83565d95b45c7a2fe2ab3f783cb1b..0000000000000000000000000000000000000000
--- a/content/common/gpu/image_transport_surface_mac.cc
+++ /dev/null
@@ -1,548 +0,0 @@
-// 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/image_transport_surface.h"
-
-#include "base/mac/scoped_cftyperef.h"
-#include "base/memory/scoped_ptr.h"
-#include "content/common/gpu/gpu_command_buffer_stub.h"
-#include "content/common/gpu/gpu_messages.h"
-#include "ui/gfx/native_widget_types.h"
-#include "ui/gl/gl_bindings.h"
-#include "ui/gl/gl_context.h"
-#include "ui/gl/gl_implementation.h"
-#include "ui/gl/gl_surface_cgl.h"
-#include "ui/gl/gl_surface_osmesa.h"
-
-// Note that this must be included after gl_bindings.h to avoid conflicts.
-#include <OpenGL/CGLIOSurface.h>
-
-namespace content {
-namespace {
-
-// IOSurface dimensions will be rounded up to a multiple of this value in order
-// to reduce memory thrashing during resize. This must be a power of 2.
-const uint32 kIOSurfaceDimensionRoundup = 64;
-
-int RoundUpSurfaceDimension(int number) {
- DCHECK(number >= 0);
- // Cast into unsigned space for portable bitwise ops.
- uint32 unsigned_number = static_cast<uint32>(number);
- uint32 roundup_sub_1 = kIOSurfaceDimensionRoundup - 1;
- unsigned_number = (unsigned_number + roundup_sub_1) & ~roundup_sub_1;
- return static_cast<int>(unsigned_number);
-}
-
-// We are backed by an offscreen surface for the purposes of creating
-// a context, but use FBOs to render to texture backed IOSurface
-class IOSurfaceImageTransportSurface
- : public gfx::NoOpGLSurfaceCGL,
- public ImageTransportSurface,
- public GpuCommandBufferStub::DestructionObserver {
- public:
- IOSurfaceImageTransportSurface(GpuChannelManager* manager,
- GpuCommandBufferStub* stub,
- gfx::PluginWindowHandle handle);
-
- // GLSurface implementation
- virtual bool Initialize() OVERRIDE;
- virtual void Destroy() OVERRIDE;
- virtual bool DeferDraws() OVERRIDE;
- virtual bool IsOffscreen() OVERRIDE;
- virtual bool SwapBuffers() OVERRIDE;
- virtual bool PostSubBuffer(int x, int y, int width, int height) OVERRIDE;
- virtual bool SupportsPostSubBuffer() OVERRIDE;
- virtual gfx::Size GetSize() OVERRIDE;
- virtual bool OnMakeCurrent(gfx::GLContext* context) OVERRIDE;
- virtual unsigned int GetBackingFrameBufferObject() OVERRIDE;
- virtual bool SetBackbufferAllocation(bool allocated) OVERRIDE;
- virtual void SetFrontbufferAllocation(bool allocated) OVERRIDE;
-
- protected:
- // ImageTransportSurface implementation
- virtual void OnBufferPresented(
- const AcceleratedSurfaceMsg_BufferPresented_Params& params) OVERRIDE;
- virtual void OnResize(gfx::Size size, float scale_factor) OVERRIDE;
- virtual void SetLatencyInfo(
- const std::vector<ui::LatencyInfo>&) OVERRIDE;
- virtual void WakeUpGpu() OVERRIDE;
-
- // GpuCommandBufferStub::DestructionObserver implementation.
- virtual void OnWillDestroyStub() OVERRIDE;
-
- private:
- virtual ~IOSurfaceImageTransportSurface() OVERRIDE;
-
- void AdjustBufferAllocation();
- void UnrefIOSurface();
- void CreateIOSurface();
-
- // Tracks the current buffer allocation state.
- bool backbuffer_suggested_allocation_;
- bool frontbuffer_suggested_allocation_;
-
- uint32 fbo_id_;
- GLuint texture_id_;
- GLuint depth_stencil_renderbuffer_id_;
-
- base::ScopedCFTypeRef<IOSurfaceRef> io_surface_;
-
- // The id of |io_surface_| or 0 if that's NULL.
- uint64 io_surface_handle_;
-
- // Weak pointer to the context that this was last made current to.
- gfx::GLContext* context_;
-
- gfx::Size size_;
- gfx::Size rounded_size_;
- float scale_factor_;
-
- // Whether or not we've successfully made the surface current once.
- bool made_current_;
-
- // Whether a SwapBuffers is pending.
- bool is_swap_buffers_pending_;
-
- // Whether we unscheduled command buffer because of pending SwapBuffers.
- bool did_unschedule_;
-
- std::vector<ui::LatencyInfo> latency_info_;
-
- scoped_ptr<ImageTransportHelper> helper_;
-
- DISALLOW_COPY_AND_ASSIGN(IOSurfaceImageTransportSurface);
-};
-
-void AddBooleanValue(CFMutableDictionaryRef dictionary,
- const CFStringRef key,
- bool value) {
- CFDictionaryAddValue(dictionary, key,
- (value ? kCFBooleanTrue : kCFBooleanFalse));
-}
-
-void AddIntegerValue(CFMutableDictionaryRef dictionary,
- const CFStringRef key,
- int32 value) {
- base::ScopedCFTypeRef<CFNumberRef> number(
- CFNumberCreate(NULL, kCFNumberSInt32Type, &value));
- CFDictionaryAddValue(dictionary, key, number.get());
-}
-
-IOSurfaceImageTransportSurface::IOSurfaceImageTransportSurface(
- GpuChannelManager* manager,
- GpuCommandBufferStub* stub,
- gfx::PluginWindowHandle handle)
- : gfx::NoOpGLSurfaceCGL(gfx::Size(1, 1)),
- backbuffer_suggested_allocation_(true),
- frontbuffer_suggested_allocation_(true),
- fbo_id_(0),
- texture_id_(0),
- depth_stencil_renderbuffer_id_(0),
- io_surface_handle_(0),
- context_(NULL),
- scale_factor_(1.f),
- made_current_(false),
- is_swap_buffers_pending_(false),
- did_unschedule_(false) {
- helper_.reset(new ImageTransportHelper(this, manager, stub, handle));
-}
-
-IOSurfaceImageTransportSurface::~IOSurfaceImageTransportSurface() {
-}
-
-bool IOSurfaceImageTransportSurface::Initialize() {
- // Only support IOSurfaces if the GL implementation is the native desktop GL.
- // IO surfaces will not work with, for example, OSMesa software renderer
- // GL contexts.
- if (gfx::GetGLImplementation() != gfx::kGLImplementationDesktopGL &&
- gfx::GetGLImplementation() != gfx::kGLImplementationAppleGL)
- return false;
-
- if (!helper_->Initialize())
- return false;
-
- if (!NoOpGLSurfaceCGL::Initialize()) {
- helper_->Destroy();
- return false;
- }
-
- helper_->stub()->AddDestructionObserver(this);
- return true;
-}
-
-void IOSurfaceImageTransportSurface::Destroy() {
- UnrefIOSurface();
-
- helper_->Destroy();
- NoOpGLSurfaceCGL::Destroy();
-}
-
-bool IOSurfaceImageTransportSurface::DeferDraws() {
- // The command buffer hit a draw/clear command that could clobber the
- // IOSurface in use by an earlier SwapBuffers. If a Swap is pending, abort
- // processing of the command by returning true and unschedule until the Swap
- // Ack arrives.
- if(did_unschedule_)
- return true; // Still unscheduled, so just return true.
- if (is_swap_buffers_pending_) {
- did_unschedule_ = true;
- helper_->SetScheduled(false);
- return true;
- }
- return false;
-}
-
-bool IOSurfaceImageTransportSurface::IsOffscreen() {
- return false;
-}
-
-bool IOSurfaceImageTransportSurface::OnMakeCurrent(gfx::GLContext* context) {
- context_ = context;
-
- if (made_current_)
- return true;
-
- OnResize(gfx::Size(1, 1), 1.f);
-
- made_current_ = true;
- return true;
-}
-
-unsigned int IOSurfaceImageTransportSurface::GetBackingFrameBufferObject() {
- return fbo_id_;
-}
-
-bool IOSurfaceImageTransportSurface::SetBackbufferAllocation(bool allocation) {
- if (backbuffer_suggested_allocation_ == allocation)
- return true;
- backbuffer_suggested_allocation_ = allocation;
- AdjustBufferAllocation();
- return true;
-}
-
-void IOSurfaceImageTransportSurface::SetFrontbufferAllocation(bool allocation) {
- if (frontbuffer_suggested_allocation_ == allocation)
- return;
- frontbuffer_suggested_allocation_ = allocation;
- AdjustBufferAllocation();
-}
-
-void IOSurfaceImageTransportSurface::AdjustBufferAllocation() {
- // On mac, the frontbuffer and backbuffer are the same buffer. The buffer is
- // free'd when both the browser and gpu processes have Unref'd the IOSurface.
- if (!backbuffer_suggested_allocation_ &&
- !frontbuffer_suggested_allocation_ &&
- io_surface_.get()) {
- UnrefIOSurface();
- helper_->Suspend();
- } else if (backbuffer_suggested_allocation_ && !io_surface_) {
- CreateIOSurface();
- }
-}
-
-bool IOSurfaceImageTransportSurface::SwapBuffers() {
- DCHECK(backbuffer_suggested_allocation_);
- if (!frontbuffer_suggested_allocation_)
- return true;
- glFlush();
-
- GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params params;
- params.surface_handle = io_surface_handle_;
- params.size = GetSize();
- params.scale_factor = scale_factor_;
- params.latency_info.swap(latency_info_);
- helper_->SendAcceleratedSurfaceBuffersSwapped(params);
-
- DCHECK(!is_swap_buffers_pending_);
- is_swap_buffers_pending_ = true;
- return true;
-}
-
-bool IOSurfaceImageTransportSurface::PostSubBuffer(
- int x, int y, int width, int height) {
- DCHECK(backbuffer_suggested_allocation_);
- if (!frontbuffer_suggested_allocation_)
- return true;
- glFlush();
-
- GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params params;
- params.surface_handle = io_surface_handle_;
- params.x = x;
- params.y = y;
- params.width = width;
- params.height = height;
- params.surface_size = GetSize();
- params.surface_scale_factor = scale_factor_;
- params.latency_info.swap(latency_info_);
- helper_->SendAcceleratedSurfacePostSubBuffer(params);
-
- DCHECK(!is_swap_buffers_pending_);
- is_swap_buffers_pending_ = true;
- return true;
-}
-
-bool IOSurfaceImageTransportSurface::SupportsPostSubBuffer() {
- return true;
-}
-
-gfx::Size IOSurfaceImageTransportSurface::GetSize() {
- return size_;
-}
-
-void IOSurfaceImageTransportSurface::OnBufferPresented(
- const AcceleratedSurfaceMsg_BufferPresented_Params& params) {
- DCHECK(is_swap_buffers_pending_);
-
- context_->share_group()->SetRendererID(params.renderer_id);
- is_swap_buffers_pending_ = false;
- if (did_unschedule_) {
- did_unschedule_ = false;
- helper_->SetScheduled(true);
- }
-}
-
-void IOSurfaceImageTransportSurface::OnResize(gfx::Size size,
- float scale_factor) {
- // This trace event is used in gpu_feature_browsertest.cc - the test will need
- // to be updated if this event is changed or moved.
- TRACE_EVENT2("gpu", "IOSurfaceImageTransportSurface::OnResize",
- "old_width", size_.width(), "new_width", size.width());
- // Caching |context_| from OnMakeCurrent. It should still be current.
- DCHECK(context_->IsCurrent(this));
-
- size_ = size;
- scale_factor_ = scale_factor;
-
- CreateIOSurface();
-}
-
-void IOSurfaceImageTransportSurface::SetLatencyInfo(
- const std::vector<ui::LatencyInfo>& latency_info) {
- for (size_t i = 0; i < latency_info.size(); i++)
- latency_info_.push_back(latency_info[i]);
-}
-
-void IOSurfaceImageTransportSurface::WakeUpGpu() {
- NOTIMPLEMENTED();
-}
-
-void IOSurfaceImageTransportSurface::OnWillDestroyStub() {
- helper_->stub()->RemoveDestructionObserver(this);
- Destroy();
-}
-
-void IOSurfaceImageTransportSurface::UnrefIOSurface() {
- // If we have resources to destroy, then make sure that we have a current
- // context which we can use to delete the resources.
- if (context_ || fbo_id_ || texture_id_ || depth_stencil_renderbuffer_id_) {
- DCHECK(gfx::GLContext::GetCurrent() == context_);
- DCHECK(context_->IsCurrent(this));
- DCHECK(CGLGetCurrentContext());
- }
-
- if (fbo_id_) {
- glDeleteFramebuffersEXT(1, &fbo_id_);
- fbo_id_ = 0;
- }
-
- if (texture_id_) {
- glDeleteTextures(1, &texture_id_);
- texture_id_ = 0;
- }
-
- if (depth_stencil_renderbuffer_id_) {
- glDeleteRenderbuffersEXT(1, &depth_stencil_renderbuffer_id_);
- depth_stencil_renderbuffer_id_ = 0;
- }
-
- io_surface_.reset();
- io_surface_handle_ = 0;
-}
-
-void IOSurfaceImageTransportSurface::CreateIOSurface() {
- gfx::Size new_rounded_size(RoundUpSurfaceDimension(size_.width()),
- RoundUpSurfaceDimension(size_.height()));
-
- // Only recreate surface when the rounded up size has changed.
- if (io_surface_.get() && new_rounded_size == rounded_size_)
- return;
-
- // This trace event is used in gpu_feature_browsertest.cc - the test will need
- // to be updated if this event is changed or moved.
- TRACE_EVENT2("gpu", "IOSurfaceImageTransportSurface::CreateIOSurface",
- "width", new_rounded_size.width(),
- "height", new_rounded_size.height());
-
- rounded_size_ = new_rounded_size;
-
- GLint previous_texture_id = 0;
- glGetIntegerv(GL_TEXTURE_BINDING_RECTANGLE_ARB, &previous_texture_id);
-
- // Free the old IO Surface first to reduce memory fragmentation.
- UnrefIOSurface();
-
- glGenFramebuffersEXT(1, &fbo_id_);
- glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, fbo_id_);
-
- glGenTextures(1, &texture_id_);
-
- // GL_TEXTURE_RECTANGLE_ARB is the best supported render target on
- // Mac OS X and is required for IOSurface interoperability.
- GLenum target = GL_TEXTURE_RECTANGLE_ARB;
- glBindTexture(target, texture_id_);
- glTexParameteri(target, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
- glTexParameteri(target, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
- glTexParameteri(target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
- glTexParameteri(target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-
- glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT,
- GL_COLOR_ATTACHMENT0_EXT,
- target,
- texture_id_,
- 0);
-
-
- // Search through the provided attributes; if the caller has
- // requested a stencil buffer, try to get one.
-
- int32 stencil_bits =
- helper_->stub()->GetRequestedAttribute(EGL_STENCIL_SIZE);
- if (stencil_bits > 0) {
- // Create and bind the stencil buffer
- bool has_packed_depth_stencil =
- GLSurface::ExtensionsContain(
- reinterpret_cast<const char *>(glGetString(GL_EXTENSIONS)),
- "GL_EXT_packed_depth_stencil");
-
- if (has_packed_depth_stencil) {
- glGenRenderbuffersEXT(1, &depth_stencil_renderbuffer_id_);
- glBindRenderbufferEXT(GL_RENDERBUFFER_EXT,
- depth_stencil_renderbuffer_id_);
- glRenderbufferStorageEXT(GL_RENDERBUFFER_EXT, GL_DEPTH24_STENCIL8_EXT,
- rounded_size_.width(), rounded_size_.height());
- glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT,
- GL_STENCIL_ATTACHMENT_EXT,
- GL_RENDERBUFFER_EXT,
- depth_stencil_renderbuffer_id_);
- }
-
- // If we asked for stencil but the extension isn't present,
- // it's OK to silently fail; subsequent code will/must check
- // for the presence of a stencil buffer before attempting to
- // do stencil-based operations.
- }
-
- // Allocate a new IOSurface, which is the GPU resource that can be
- // shared across processes.
- base::ScopedCFTypeRef<CFMutableDictionaryRef> properties;
- properties.reset(CFDictionaryCreateMutable(kCFAllocatorDefault,
- 0,
- &kCFTypeDictionaryKeyCallBacks,
- &kCFTypeDictionaryValueCallBacks));
- AddIntegerValue(properties,
- kIOSurfaceWidth,
- rounded_size_.width());
- AddIntegerValue(properties,
- kIOSurfaceHeight,
- rounded_size_.height());
- AddIntegerValue(properties,
- kIOSurfaceBytesPerElement, 4);
- AddBooleanValue(properties,
- kIOSurfaceIsGlobal, true);
- // I believe we should be able to unreference the IOSurfaces without
- // synchronizing with the browser process because they are
- // ultimately reference counted by the operating system.
- io_surface_.reset(IOSurfaceCreate(properties));
- io_surface_handle_ = IOSurfaceGetID(io_surface_);
-
- // Don't think we need to identify a plane.
- GLuint plane = 0;
- CGLError cglerror =
- CGLTexImageIOSurface2D(
- static_cast<CGLContextObj>(context_->GetHandle()),
- target,
- GL_RGBA,
- rounded_size_.width(),
- rounded_size_.height(),
- GL_BGRA,
- GL_UNSIGNED_INT_8_8_8_8_REV,
- io_surface_.get(),
- plane);
- if (cglerror != kCGLNoError) {
- UnrefIOSurface();
- return;
- }
-
- glFlush();
-
- GLenum status = glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
- if (status != GL_FRAMEBUFFER_COMPLETE_EXT) {
- DLOG(ERROR) << "Framebuffer was incomplete: " << status;
- UnrefIOSurface();
- return;
- }
-
- glBindTexture(target, previous_texture_id);
- // The FBO remains bound for this GL context.
-}
-
-// A subclass of GLSurfaceOSMesa that doesn't print an error message when
-// SwapBuffers() is called.
-class DRTSurfaceOSMesa : public gfx::GLSurfaceOSMesa {
- public:
- // Size doesn't matter, the surface is resized to the right size later.
- DRTSurfaceOSMesa() : GLSurfaceOSMesa(GL_RGBA, gfx::Size(1, 1)) {}
-
- // Implement a subset of GLSurface.
- virtual bool SwapBuffers() OVERRIDE;
-
- private:
- virtual ~DRTSurfaceOSMesa() {}
- DISALLOW_COPY_AND_ASSIGN(DRTSurfaceOSMesa);
-};
-
-bool DRTSurfaceOSMesa::SwapBuffers() {
- return true;
-}
-
-bool g_allow_os_mesa = false;
-
-} // namespace
-
-// static
-scoped_refptr<gfx::GLSurface> ImageTransportSurface::CreateNativeSurface(
- GpuChannelManager* manager,
- GpuCommandBufferStub* stub,
- const gfx::GLSurfaceHandle& surface_handle) {
- DCHECK(surface_handle.transport_type == gfx::NATIVE_DIRECT ||
- surface_handle.transport_type == gfx::NATIVE_TRANSPORT);
-
- switch (gfx::GetGLImplementation()) {
- case gfx::kGLImplementationDesktopGL:
- case gfx::kGLImplementationAppleGL:
- return scoped_refptr<gfx::GLSurface>(new IOSurfaceImageTransportSurface(
- manager, stub, surface_handle.handle));
-
- default:
- // Content shell in DRT mode spins up a gpu process which needs an
- // image transport surface, but that surface isn't used to read pixel
- // baselines. So this is mostly a dummy surface.
- if (!g_allow_os_mesa) {
- NOTREACHED();
- return scoped_refptr<gfx::GLSurface>();
- }
- scoped_refptr<gfx::GLSurface> surface(new DRTSurfaceOSMesa());
- if (!surface.get() || !surface->Initialize())
- return surface;
- return scoped_refptr<gfx::GLSurface>(new PassThroughImageTransportSurface(
- manager, stub, surface.get()));
- }
-}
-
-// static
-void ImageTransportSurface::SetAllowOSMesaForTesting(bool allow) {
- g_allow_os_mesa = allow;
-}
-
-} // namespace content
« no previous file with comments | « content/common/gpu/image_transport_surface_iosurface_mac.cc ('k') | content/common/gpu/image_transport_surface_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698