GL: DisplayGLX::makeCurrent should handle drawSurface==0

In this case the draw surface should be unbound, but ANGLE had been skipping this case (and handling it internally). This caused a crash on Linux Intel. Now makeCurrent is actually called on the driver with drawSurface mDummyPbuffer. Bug: chromium:988440 Change-Id: Ifae7a828455eb67e516a47515ec6c24cc36e3c2b Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1808719 Commit-Queue: Jonah Ryan-Davis <jonahr@google.com> Reviewed-by: Geoff Lang <geofflang@chromium.org>

GL: DisplayGLX::makeCurrent should handle drawSurface==0
ac7c876b · Jonah Ryan-Davis · Commit Bot · e6582161 · ac7c876b
Commit ac7c876b authored Sep 17, 2019 by Jonah Ryan-Davis Committed by Commit Bot Sep 19, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 8 deletions

DisplayGLX.cpp src/libANGLE/renderer/gl/glx/DisplayGLX.cpp +6 -8

No files found.
--- a/src/libANGLE/renderer/gl/glx/DisplayGLX.cpp
+++ b/src/libANGLE/renderer/gl/glx/DisplayGLX.cpp
@@ -380,17 +380,15 @@ egl::Error DisplayGLX::makeCurrent(egl::Surface *drawSurface,
                                   egl::Surface *readSurface,
                                   gl::Context *context)
 {
-    if (drawSurface)
+    glx::Drawable drawable =
+        (drawSurface ? GetImplAs<SurfaceGLX>(drawSurface)->getDrawable() : mDummyPbuffer);
+    if (drawable != mCurrentDrawable)
    {
-        glx::Drawable drawable = GetImplAs<SurfaceGLX>(drawSurface)->getDrawable();
+        if (mGLX.makeCurrent(drawable, mContext) != True)
-        if (drawable != mCurrentDrawable)
        {
-            if (mGLX.makeCurrent(drawable, mContext) != True)
+            return egl::EglContextLost() << "Failed to make the GLX context current";
-            {
-                return egl::EglContextLost() << "Failed to make the GLX context current";
-            }
-            mCurrentDrawable = drawable;
        }
+        mCurrentDrawable = drawable;
    }
    return DisplayGL::makeCurrent(drawSurface, readSurface, context);