commit c295e51609b7a31e4abc3f5259c24317b336efff
author Corentin Wallez <cwallez@chromium.org> Fri Jan 27 17:47:50 2017 -0500
committer Commit Bot <commit-bot@chromium.org> Mon Feb 06 20:42:11 2017 +0000
tree 54d89a3d48b79d88a18dd3075888d29deb89ce12
parent bcb3f9baf73bbae30ae0570e5afd788974ac60c0

Implement EGL_KHR_surfaceless_context

BUG=angleproject:1651

Change-Id: I710df14c2bfa55db2fb9b9715001756d1c1a8f1b
Reviewed-on: https://chromium-review.googlesource.com/434763
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>

src/libANGLE/Context.cpp

diff --git a/src/libANGLE/Context.cpp b/src/libANGLE/Context.cpp
index 2663bb8..66fe675 100644
--- a/src/libANGLE/Context.cpp
+++ b/src/libANGLE/Context.cpp
@@ -20,7 +20,6 @@
 #include "common/version.h"
 #include "libANGLE/Buffer.h"
 #include "libANGLE/Compiler.h"
-#include "libANGLE/Display.h"
 #include "libANGLE/Fence.h"
 #include "libANGLE/Framebuffer.h"
 #include "libANGLE/FramebufferAttachment.h"
@@ -237,7 +236,8 @@
 Context::Context(rx::EGLImplFactory *implFactory,
                  const egl::Config *config,
                  const Context *shareContext,
-                 const egl::AttributeMap &attribs)
+                 const egl::AttributeMap &attribs,
+                 const egl::DisplayExtensions &displayExtensions)
 
     : ValidationContext(shareContext,
                         GetClientVersion(attribs),
@@ -265,7 +265,7 @@
         UNIMPLEMENTED();
     }
 
-    initCaps(GetWebGLContext(attribs));
+    initCaps(GetWebGLContext(attribs), displayExtensions);
     initWorkarounds();
 
     mGLState.initialize(mCaps, mExtensions, getClientVersion(), GetDebug(attribs),
@@ -419,10 +419,7 @@
 
     SafeDelete(mSurfacelessFramebuffer);
 
-    if (mCurrentSurface != nullptr)
-    {
-        releaseSurface();
-    }
+    releaseSurface();
 
     SafeDelete(mCompiler);
 }
@@ -435,8 +432,16 @@
         initVersionStrings();
         initExtensionStrings();
 
-        mGLState.setViewportParams(0, 0, surface->getWidth(), surface->getHeight());
-        mGLState.setScissorParams(0, 0, surface->getWidth(), surface->getHeight());
+        int width  = 0;
+        int height = 0;
+        if (surface != nullptr)
+        {
+            width  = surface->getWidth();
+            height = surface->getHeight();
+        }
+
+        mGLState.setViewportParams(0, 0, width, height);
+        mGLState.setScissorParams(0, 0, width, height);
 
         mHasBeenCurrent = true;
     }
@@ -444,10 +449,7 @@
     // TODO(jmadill): Rework this when we support ContextImpl
     mGLState.setAllDirtyBits();
 
-    if (mCurrentSurface)
-    {
-        releaseSurface();
-    }
+    releaseSurface();
 
     Framebuffer *newDefault = nullptr;
     if (surface != nullptr)
@@ -486,24 +488,32 @@
 
 void Context::releaseSurface()
 {
-    ASSERT(mCurrentSurface != nullptr);
-
     // Remove the default framebuffer
+    Framebuffer *currentDefault = nullptr;
+    if (mCurrentSurface != nullptr)
     {
-        Framebuffer *currentDefault = mCurrentSurface->getDefaultFramebuffer();
-        if (mGLState.getReadFramebuffer() == currentDefault)
-        {
-            mGLState.setReadFramebufferBinding(nullptr);
-        }
-        if (mGLState.getDrawFramebuffer() == currentDefault)
-        {
-            mGLState.setDrawFramebufferBinding(nullptr);
-        }
-        mState.mFramebuffers->setDefaultFramebuffer(nullptr);
+        currentDefault = mCurrentSurface->getDefaultFramebuffer();
+    }
+    else if (mSurfacelessFramebuffer != nullptr)
+    {
+        currentDefault = mSurfacelessFramebuffer;
     }
 
-    mCurrentSurface->setIsCurrent(false);
-    mCurrentSurface = nullptr;
+    if (mGLState.getReadFramebuffer() == currentDefault)
+    {
+        mGLState.setReadFramebufferBinding(nullptr);
+    }
+    if (mGLState.getDrawFramebuffer() == currentDefault)
+    {
+        mGLState.setDrawFramebufferBinding(nullptr);
+    }
+    mState.mFramebuffers->setDefaultFramebuffer(nullptr);
+
+    if (mCurrentSurface)
+    {
+        mCurrentSurface->setIsCurrent(false);
+        mCurrentSurface = nullptr;
+    }
 }
 
 GLuint Context::createBuffer()
@@ -2378,7 +2388,7 @@
     return false;
 }
 
-void Context::initCaps(bool webGLContext)
+void Context::initCaps(bool webGLContext, const egl::DisplayExtensions &displayExtensions)
 {
     mCaps = mImplementation->getNativeCaps();
 
@@ -2410,7 +2420,7 @@
     mExtensions.noError = mSkipValidation;
 
     // Enable surfaceless to advertise we'll have the correct behavior when there is no default FBO
-    mExtensions.surfacelessContext = true;
+    mExtensions.surfacelessContext = displayExtensions.surfacelessContext;
 
     // Explicitly enable GL_KHR_debug
     mExtensions.debug                   = true;