diff options
| author | ccameron@chromium.org <ccameron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-20 12:36:09 +0000 |
|---|---|---|
| committer | ccameron@chromium.org <ccameron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-20 12:36:09 +0000 |
| commit | 8190aed1bd6b649f09e1c7e76128d6812ed51398 (patch) | |
| tree | e58f627279391994a0d4ad05409f6a7e964b4be8 /gpu | |
| parent | 43701242f71429a872b6de8a843d7a04e07b5d7b (diff) | |
| download | chromium_src-8190aed1bd6b649f09e1c7e76128d6812ed51398.zip chromium_src-8190aed1bd6b649f09e1c7e76128d6812ed51398.tar.gz chromium_src-8190aed1bd6b649f09e1c7e76128d6812ed51398.tar.bz2 | |
Return the shared context's handle when a virtualized context's
handle is requested.
GLES2DecoderImpl::DoTexImageIOSurface2DCHROMIUM uses
GLContext::GetHandle's result as an argument to
CGLTexImageIOSurface2D, which expects a valid CGLContextObj
as the handle (not NULL).
BUG=230300
Review URL: https://chromiumcodereview.appspot.com/14241007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195390 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
| -rw-r--r-- | gpu/command_buffer/service/gl_context_virtual.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gpu/command_buffer/service/gl_context_virtual.cc b/gpu/command_buffer/service/gl_context_virtual.cc index 71c4762..66572ae 100644 --- a/gpu/command_buffer/service/gl_context_virtual.cc +++ b/gpu/command_buffer/service/gl_context_virtual.cc @@ -73,7 +73,7 @@ bool GLContextVirtual::IsCurrent(gfx::GLSurface* surface) { } void* GLContextVirtual::GetHandle() { - return NULL; + return shared_context_->GetHandle(); } gfx::GLStateRestorer* GLContextVirtual::GetGLStateRestorer() { |