diff options
| author | ccameron@chromium.org <ccameron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-03 18:50:06 +0000 |
|---|---|---|
| committer | ccameron@chromium.org <ccameron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-03 18:50:06 +0000 |
| commit | 55e136fcea039657a9fb9bd2847169233e67dba1 (patch) | |
| tree | d7a679bae907b5439441a79a63bc51e3f4b76cb6 /ui/gl/gl_surface_cgl.h | |
| parent | c183fb6f7fbb190d75ff6a5ff57c6cb445524145 (diff) | |
| download | chromium_src-55e136fcea039657a9fb9bd2847169233e67dba1.zip chromium_src-55e136fcea039657a9fb9bd2847169233e67dba1.tar.gz chromium_src-55e136fcea039657a9fb9bd2847169233e67dba1.tar.bz2 | |
Fix GL virtualization warnings on OS X
Stub out GetDisplay for GLSurfaceCGL so that the NOTIMPLEMENTED
in GLSurface is not hit.
Fix a bug where, when using context virtualization, a
GL_INVALD_FRAMEBUFFER_OPERATION is generated by
GLES2DecoderImpl::Initialize. This is a use-before-initialization bug
wherein GpuCommandBufferStub::Initialize calls MakeCurrent on
the virtual context, and because decoder_ is non-NULL in
GLContextVirtual::MakeCurrent, we try to restore the state
from the decoder (but decoder_ has not yet been initialized).
Remove extra logic to prevent calling Destroy on un-initialized
decoders, and add a check inside Destroy.
BUG=180463
Review URL: https://chromiumcodereview.appspot.com/13430019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@192109 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gl/gl_surface_cgl.h')
| -rw-r--r-- | ui/gl/gl_surface_cgl.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ui/gl/gl_surface_cgl.h b/ui/gl/gl_surface_cgl.h index 822956a..4786acd 100644 --- a/ui/gl/gl_surface_cgl.h +++ b/ui/gl/gl_surface_cgl.h @@ -40,6 +40,7 @@ class GL_EXPORT NoOpGLSurfaceCGL : public GLSurfaceCGL { virtual bool SwapBuffers() OVERRIDE; virtual gfx::Size GetSize() OVERRIDE; virtual void* GetHandle() OVERRIDE; + virtual void* GetDisplay() OVERRIDE; protected: virtual ~NoOpGLSurfaceCGL(); |