Initialize gl::Context state on the first call to MakeCurrent.

src/libANGLE/Context.cpp

@@ -294,6 +294,8 @@ Context::Context(rx::EGLImplFactory *implFactory,
       mContextLostForced(false),
       mResetStrategy(GetResetStrategy(attribs)),
       mRobustAccess(GetRobustAccess(attribs)),
+      mSurfacelessSupported(displayExtensions.surfacelessContext),
+      mExplicitContextAvailable(clientExtensions.explicitContext),
       mCurrentSurface(static_cast<egl::Surface *>(EGL_NO_SURFACE)),
       mCurrentDisplay(static_cast<egl::Display *>(EGL_NO_DISPLAY)),
       mWebGLContext(GetWebGLContext(attribs)),
@@ -305,11 +307,13 @@ Context::Context(rx::EGLImplFactory *implFactory,
     // Needed to solve a Clang warning of unused variables.
     ANGLE_UNUSED_VARIABLE(mSavedArgsType);
     ANGLE_UNUSED_VARIABLE(mParamsBuffer);
+}
 
-    mImplementation->setMemoryProgramCache(memoryProgramCache);
+void Context::initialize()
+{
+    mImplementation->setMemoryProgramCache(mMemoryProgramCache);
 
-    bool robustResourceInit = GetRobustResourceInit(attribs);
-    initCaps(displayExtensions, clientExtensions, robustResourceInit);
+    initCaps();
     initWorkarounds();
 
     mGLState.initialize(this);
@@ -520,6 +524,7 @@ egl::Error Context::makeCurrent(egl::Display *display, egl::Surface *surface)
 
     if (!mHasBeenCurrent)
     {
+        initialize();
         initRendererString();
         initVersionStrings();
         initExtensionStrings();
@@ -3019,9 +3024,7 @@ bool Context::hasActiveTransformFeedback(GLuint program) const
     return false;
 }
 
-Extensions Context::generateSupportedExtensions(const egl::DisplayExtensions &displayExtensions,
-                                                const egl::ClientExtensions &clientExtensions,
-                                                bool robustResourceInit) const
+Extensions Context::generateSupportedExtensions() const
 {
     Extensions supportedExtensions = mImplementation->getNativeExtensions();
 
@@ -3065,7 +3068,7 @@ Extensions Context::generateSupportedExtensions(const egl::DisplayExtensions &di
     supportedExtensions.noError = mSkipValidation;
 
     // Enable surfaceless to advertise we'll have the correct behavior when there is no default FBO
-    supportedExtensions.surfacelessContext = displayExtensions.surfacelessContext;
+    supportedExtensions.surfacelessContext = mSurfacelessSupported;
 
     // Explicitly enable GL_KHR_debug
     supportedExtensions.debug                   = true;
@@ -3078,7 +3081,7 @@ Extensions Context::generateSupportedExtensions(const egl::DisplayExtensions &di
     supportedExtensions.robustClientMemory = true;
 
     // Determine robust resource init availability from EGL.
-    supportedExtensions.robustResourceInitialization = robustResourceInit;
+    supportedExtensions.robustResourceInitialization = mGLState.isRobustResourceInitEnabled();
 
     // mExtensions.robustBufferAccessBehavior is true only if robust access is true and the backend
     // supports it.
@@ -3089,7 +3092,7 @@ Extensions Context::generateSupportedExtensions(const egl::DisplayExtensions &di
     supportedExtensions.programCacheControl = true;
 
     // Enable EGL_ANGLE_explicit_context subextensions
-    if (clientExtensions.explicitContext)
+    if (mExplicitContextAvailable)
     {
         // GL_ANGLE_explicit_context_gles1
         supportedExtensions.explicitContextGles1 = true;
@@ -3100,15 +3103,12 @@ Extensions Context::generateSupportedExtensions(const egl::DisplayExtensions &di
     return supportedExtensions;
 }
 
-void Context::initCaps(const egl::DisplayExtensions &displayExtensions,
-                       const egl::ClientExtensions &clientExtensions,
-                       bool robustResourceInit)
+void Context::initCaps()
 {
     mCaps = mImplementation->getNativeCaps();
 
-    mSupportedExtensions =
-        generateSupportedExtensions(displayExtensions, clientExtensions, robustResourceInit);
-    mExtensions = mSupportedExtensions;
+    mSupportedExtensions = generateSupportedExtensions();
+    mExtensions          = mSupportedExtensions;
 
     mLimitations = mImplementation->getNativeLimitations();
 

src/libANGLE/Context.h

@@ -1466,6 +1466,8 @@ class Context final : angle::NonCopyable
     AttributesMask getVertexArraysAttributeMask() const;
 
   private:
+    void initialize();
+
     Error prepareForDraw();
     Error prepareForClear(GLbitfield mask);
     Error prepareForClearBuffer(GLenum buffer, GLint drawbuffer);
@@ -1495,12 +1497,8 @@ class Context final : angle::NonCopyable
     void initVersionStrings();
     void initExtensionStrings();
 
-    Extensions generateSupportedExtensions(const egl::DisplayExtensions &displayExtensions,
-                                           const egl::ClientExtensions &clientExtensions,
-                                           bool robustResourceInit) const;
-    void initCaps(const egl::DisplayExtensions &displayExtensions,
-                  const egl::ClientExtensions &clientExtensions,
-                  bool robustResourceInit);
+    Extensions generateSupportedExtensions() const;
+    void initCaps();
     void updateCaps();
     void initWorkarounds();
 
@@ -1574,11 +1572,13 @@ class Context final : angle::NonCopyable
     mutable GLenum mResetStatus;
     mutable bool mContextLostForced;
     GLenum mResetStrategy;
-    bool mRobustAccess;
+    const bool mRobustAccess;
+    const bool mSurfacelessSupported;
+    const bool mExplicitContextAvailable;
     egl::Surface *mCurrentSurface;
     egl::Display *mCurrentDisplay;
-    bool mWebGLContext;
-    bool mExtensionsEnabled;
+    const bool mWebGLContext;
+    const bool mExtensionsEnabled;
     MemoryProgramCache *mMemoryProgramCache;
 
     State::DirtyBits mTexImageDirtyBits;

src/libANGLE/renderer/vulkan/vk_helpers.cpp

@@ -281,7 +281,8 @@ DynamicDescriptorPool::~DynamicDescriptorPool()
 
 void DynamicDescriptorPool::destroy(RendererVk *rendererVk)
 {
-    ASSERT(mCurrentDescriptorSetPool.valid());
+    // It's possible that mCurrentDescriptorSetPool is not valid if the owning context was never
+    // made current/initialized
     mCurrentDescriptorSetPool.destroy(rendererVk->getDevice());
 }