diff options
| author | msimonides@opera.com <msimonides@opera.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-11 12:10:51 +0000 |
|---|---|---|
| committer | msimonides@opera.com <msimonides@opera.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-11 12:10:51 +0000 |
| commit | d7c7a484468aef5b28ffc35f7ec5c0c3fad919d4 (patch) | |
| tree | fffd0440dcb8c0fb5d1ea2a538b39ff42f343273 /gpu/command_buffer/service | |
| parent | 7e27c37aee946f7076721085272518e60e26c325 (diff) | |
| download | chromium_src-d7c7a484468aef5b28ffc35f7ec5c0c3fad919d4.zip chromium_src-d7c7a484468aef5b28ffc35f7ec5c0c3fad919d4.tar.gz chromium_src-d7c7a484468aef5b28ffc35f7ec5c0c3fad919d4.tar.bz2 | |
Remove the problematic call to GLSurface::GetBackingFrameBufferObject.
GLContextVirtual::IsCurrent doesn't need to call
GetBackingFrameBufferObject on a surface, the IsOffScreen check should
be enough.
The direct reason for this change is that GLContextVirtual::IsCurrent's
use of GetBackingFrameBufferObject interferes with the implementation of
that function in TextureImageTransportSurface.
TextureImageTransportSurface::GetBackingFrameBufferObject creates an FBO
if needed. Unfortunately GLContextVirtual::IsCurrent is called early in
GLContextVirtual's initialization, too early for
TextureImageTransportSurface::GetBackingFrameBufferObject to create the
frame buffer object because it needs a fully initialized context to
succeed.
BUG=
Review URL: https://chromiumcodereview.appspot.com/23480048
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@222505 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/command_buffer/service')
| -rw-r--r-- | gpu/command_buffer/service/gl_context_virtual.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/gpu/command_buffer/service/gl_context_virtual.cc b/gpu/command_buffer/service/gl_context_virtual.cc index e7a4c04..a29e540 100644 --- a/gpu/command_buffer/service/gl_context_virtual.cc +++ b/gpu/command_buffer/service/gl_context_virtual.cc @@ -71,8 +71,7 @@ void GLContextVirtual::ReleaseCurrent(gfx::GLSurface* surface) { bool GLContextVirtual::IsCurrent(gfx::GLSurface* surface) { // If it's a real surface it needs to be current. if (surface && - !surface->IsOffscreen() && - !surface->GetBackingFrameBufferObject()) + !surface->IsOffscreen()) return shared_context_->IsCurrent(surface); // Otherwise, only insure the context itself is current. |