Bug 735230 - Part 4: Don't call MakeCurrent with a context and without a surface. r=gw280
authorAli Juma <ajuma@mozilla.com>
Wed, 28 Mar 2012 18:00:41 -0400
changeset 93883 842d96e5f3afb4f0cb76621c8d3c4da3f4f9a6d1
parent 93882 9435818930fabd03b6449f3124b9f25be2811eee
child 93884 378f5363558939b964c41cdc30c3e26d3d241fae
push id886
push userlsblakk@mozilla.com
push dateMon, 04 Jun 2012 19:57:52 +0000
treeherdermozilla-beta@bbd8d5efd6d1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgw280
bugs735230
milestone14.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 735230 - Part 4: Don't call MakeCurrent with a context and without a surface. r=gw280
gfx/gl/GLContextProviderEGL.cpp
--- a/gfx/gl/GLContextProviderEGL.cpp
+++ b/gfx/gl/GLContextProviderEGL.cpp
@@ -429,17 +429,17 @@ public:
         // still expensive.
 #ifndef MOZ_WIDGET_QT
         if (!mSurface) {
             // We need to be able to bind NO_SURFACE when we don't
             // have access to a surface. We won't be drawing to the screen
             // but we will be able to do things like resource releases.
             succeeded = sEGLLibrary.fMakeCurrent(EGL_DISPLAY(),
                                                  EGL_NO_SURFACE, EGL_NO_SURFACE,
-                                                 mContext);
+                                                 EGL_NO_CONTEXT);
             if (!succeeded && sEGLLibrary.fGetError() == LOCAL_EGL_CONTEXT_LOST) {
                 mContextLost = true;
                 NS_WARNING("EGL context has been lost.");
             }
             NS_ASSERTION(succeeded, "Failed to make GL context current!");
             return succeeded;
         }
 #endif