Clear draw attachments as a dirty object.

src/libANGLE/Context.cpp

@@ -1475,8 +1475,6 @@ void Context::getIntegervImpl(GLenum pname, GLint *params)
         case GL_MAX_DRAW_BUFFERS_EXT:
             *params = mCaps.maxDrawBuffers;
             break;
-        // case GL_FRAMEBUFFER_BINDING:                    // now equivalent to
-        // GL_DRAW_FRAMEBUFFER_BINDING_ANGLE
         case GL_SUBPIXEL_BITS:
             *params = 4;
             break;
@@ -3472,6 +3470,12 @@ void Context::updateCaps()
 
     mThreadPool = angle::WorkerThreadPool::Create(mExtensions.parallelShaderCompile);
 
+    // Reinitialize some dirty bits that depend on extensions.
+    mDrawDirtyObjects.set(State::DIRTY_OBJECT_DRAW_ATTACHMENTS,
+                          mGLState.isRobustResourceInitEnabled());
+    mBlitDirtyObjects.set(State::DIRTY_OBJECT_DRAW_ATTACHMENTS,
+                          mGLState.isRobustResourceInitEnabled());
+
     // Reinitialize state cache after extension changes.
     mStateCache.initialize(this);
 }
@@ -3518,7 +3522,7 @@ angle::Result Context::prepareForDraw(PrimitiveMode mode)
     if (isRobustResourceInitEnabled())
     {
         ANGLE_TRY(mGLState.clearUnclearedActiveTextures(this));
-        ANGLE_TRY(mGLState.getDrawFramebuffer()->ensureDrawAttachmentsInitialized(this));
+        ASSERT(!mGLState.getDrawFramebuffer()->hasResourceThatNeedsInit());
     }
 
     ANGLE_TRY(syncDirtyBits());
@@ -3964,7 +3968,7 @@ void Context::drawBuffers(GLsizei n, const GLenum *bufs)
     Framebuffer *framebuffer = mGLState.getDrawFramebuffer();
     ASSERT(framebuffer);
     framebuffer->setDrawBuffers(n, bufs);
-    mGLState.setObjectDirty(GL_DRAW_FRAMEBUFFER);
+    mGLState.setDrawFramebufferDirty();
     mStateCache.onDrawFramebufferChange(this);
 }
 
@@ -7251,7 +7255,8 @@ bool Context::getQueryParameterInfo(GLenum pname, GLenum *type, unsigned int *nu
         case GL_NUM_SHADER_BINARY_FORMATS:
         case GL_NUM_COMPRESSED_TEXTURE_FORMATS:
         case GL_ARRAY_BUFFER_BINDING:
-        case GL_FRAMEBUFFER_BINDING:
+        case GL_FRAMEBUFFER_BINDING:  // GL_FRAMEBUFFER_BINDING now equivalent to
+                                      // GL_DRAW_FRAMEBUFFER_BINDING_ANGLE
         case GL_RENDERBUFFER_BINDING:
         case GL_CURRENT_PROGRAM:
         case GL_PACK_ALIGNMENT:
@@ -7553,7 +7558,7 @@ bool Context::getQueryParameterInfo(GLenum pname, GLenum *type, unsigned int *nu
     // Check for ES3.0+ parameter names which are also exposed as ES2 extensions
     switch (pname)
     {
-        // case GL_DRAW_FRAMEBUFFER_BINDING_ANGLE  // equivalent to FRAMEBUFFER_BINDING
+        // GL_DRAW_FRAMEBUFFER_BINDING_ANGLE equivalent to FRAMEBUFFER_BINDING
         case GL_READ_FRAMEBUFFER_BINDING_ANGLE:
             if ((getClientMajorVersion() < 3) && !getExtensions().framebufferBlit)
             {
@@ -8104,7 +8109,7 @@ void Context::onSubjectStateChange(const Context *context,
         case kDrawFramebufferSubjectIndex:
             if (message == angle::SubjectMessage::STORAGE_CHANGED)
             {
-                mGLState.setObjectDirty(GL_DRAW_FRAMEBUFFER);
+                mGLState.setDrawFramebufferDirty();
             }
             mStateCache.onDrawFramebufferChange(this);
             break;

src/libANGLE/Framebuffer.h

@@ -338,6 +338,8 @@ class Framebuffer final : public angle::ObserverInterface,
     using DirtyBits = angle::BitSet<DIRTY_BIT_MAX>;
     bool hasAnyDirtyBit() const { return mDirtyBits.any(); }
 
+    bool hasResourceThatNeedsInit() const { return mState.mResourceNeedsInit.any(); }
+
     angle::Result syncState(const Context *context);
 
     // Observer implementation

src/libANGLE/State.cpp

@@ -1092,7 +1092,7 @@ void State::detachTexture(const Context *context, const TextureMap &zeroTextures
 
     if (mDrawFramebuffer && mDrawFramebuffer->detachTexture(context, texture))
     {
-        mDirtyObjects.set(DIRTY_OBJECT_DRAW_FRAMEBUFFER);
+        setDrawFramebufferDirty();
     }
 }
 
@@ -1167,7 +1167,7 @@ void State::detachRenderbuffer(const Context *context, GLuint renderbuffer)
     {
         if (drawFramebuffer->detachRenderbuffer(context, renderbuffer))
         {
-            mDirtyObjects.set(DIRTY_OBJECT_DRAW_FRAMEBUFFER);
+            setDrawFramebufferDirty();
         }
     }
 }
@@ -1194,9 +1194,17 @@ void State::setDrawFramebufferBinding(Framebuffer *framebuffer)
     mDrawFramebuffer = framebuffer;
     mDirtyBits.set(DIRTY_BIT_DRAW_FRAMEBUFFER_BINDING);
 
-    if (mDrawFramebuffer && mDrawFramebuffer->hasAnyDirtyBit())
+    if (mDrawFramebuffer)
     {
-        mDirtyObjects.set(DIRTY_OBJECT_DRAW_FRAMEBUFFER);
+        if (mDrawFramebuffer->hasAnyDirtyBit())
+        {
+            mDirtyObjects.set(DIRTY_OBJECT_DRAW_FRAMEBUFFER);
+        }
+
+        if (mRobustResourceInit && mDrawFramebuffer->hasResourceThatNeedsInit())
+        {
+            mDirtyObjects.set(DIRTY_OBJECT_DRAW_ATTACHMENTS);
+        }
     }
 }
 
@@ -2485,12 +2493,20 @@ angle::Result State::syncReadFramebuffer(const Context *context)
     return mReadFramebuffer->syncState(context);
 }
 
-angle::Result State::syncWriteFramebuffer(const Context *context)
+angle::Result State::syncDrawFramebuffer(const Context *context)
 {
     ASSERT(mDrawFramebuffer);
     return mDrawFramebuffer->syncState(context);
 }
 
+angle::Result State::syncDrawAttachments(const Context *context)
+{
+    ASSERT(mDrawFramebuffer);
+    ASSERT(!mDrawFramebuffer->hasAnyDirtyBit());
+    ASSERT(mRobustResourceInit);
+    return mDrawFramebuffer->ensureDrawAttachmentsInitialized(context);
+}
+
 angle::Result State::syncVertexArray(const Context *context)
 {
     ASSERT(mVertexArray);
@@ -2627,11 +2643,11 @@ void State::setObjectDirty(GLenum target)
             mDirtyObjects.set(DIRTY_OBJECT_READ_FRAMEBUFFER);
             break;
         case GL_DRAW_FRAMEBUFFER:
-            mDirtyObjects.set(DIRTY_OBJECT_DRAW_FRAMEBUFFER);
+            setDrawFramebufferDirty();
             break;
         case GL_FRAMEBUFFER:
             mDirtyObjects.set(DIRTY_OBJECT_READ_FRAMEBUFFER);
-            mDirtyObjects.set(DIRTY_OBJECT_DRAW_FRAMEBUFFER);
+            setDrawFramebufferDirty();
             break;
         case GL_VERTEX_ARRAY:
             mDirtyObjects.set(DIRTY_OBJECT_VERTEX_ARRAY);

src/libANGLE/State.h

@@ -485,6 +485,7 @@ class State : angle::NonCopyable
     {
         DIRTY_OBJECT_READ_FRAMEBUFFER = 0,
         DIRTY_OBJECT_DRAW_FRAMEBUFFER,
+        DIRTY_OBJECT_DRAW_ATTACHMENTS,
         DIRTY_OBJECT_VERTEX_ARRAY,
         DIRTY_OBJECT_SAMPLERS,
         // Use a very coarse bit for any program or texture change.
@@ -509,6 +510,12 @@ class State : angle::NonCopyable
     void setObjectDirty(GLenum target);
     void setSamplerDirty(size_t samplerIndex);
 
+    ANGLE_INLINE void setDrawFramebufferDirty()
+    {
+        mDirtyObjects.set(DIRTY_OBJECT_DRAW_FRAMEBUFFER);
+        mDirtyObjects.set(DIRTY_OBJECT_DRAW_ATTACHMENTS);
+    }
+
     // This actually clears the current value dirty bits.
     // TODO(jmadill): Pass mutable dirty bits into Impl.
     AttributesMask getAndResetDirtyCurrentValues() const;
@@ -558,7 +565,8 @@ class State : angle::NonCopyable
 
     // Functions to synchronize dirty states
     angle::Result syncReadFramebuffer(const Context *context);
-    angle::Result syncWriteFramebuffer(const Context *context);
+    angle::Result syncDrawFramebuffer(const Context *context);
+    angle::Result syncDrawAttachments(const Context *context);
     angle::Result syncVertexArray(const Context *context);
     angle::Result syncSamplers(const Context *context);
     angle::Result syncProgramTextures(const Context *context);
@@ -566,15 +574,17 @@ class State : angle::NonCopyable
 
     using DirtyObjectHandler = angle::Result (State::*)(const Context *context);
     static constexpr DirtyObjectHandler kDirtyObjectHandlers[DIRTY_OBJECT_MAX] = {
-        &State::syncReadFramebuffer, &State::syncWriteFramebuffer, &State::syncVertexArray,
-        &State::syncSamplers,        &State::syncProgramTextures,  &State::syncProgram};
+        &State::syncReadFramebuffer, &State::syncDrawFramebuffer, &State::syncDrawAttachments,
+        &State::syncVertexArray,     &State::syncSamplers,        &State::syncProgramTextures,
+        &State::syncProgram};
 
     static_assert(DIRTY_OBJECT_READ_FRAMEBUFFER == 0, "check DIRTY_OBJECT_READ_FRAMEBUFFER index");
     static_assert(DIRTY_OBJECT_DRAW_FRAMEBUFFER == 1, "check DIRTY_OBJECT_DRAW_FRAMEBUFFER index");
-    static_assert(DIRTY_OBJECT_VERTEX_ARRAY == 2, "check DIRTY_OBJECT_VERTEX_ARRAY index");
-    static_assert(DIRTY_OBJECT_SAMPLERS == 3, "check DIRTY_OBJECT_SAMPLERS index");
-    static_assert(DIRTY_OBJECT_PROGRAM_TEXTURES == 4, "check DIRTY_OBJECT_PROGRAM_TEXTURES index");
-    static_assert(DIRTY_OBJECT_PROGRAM == 5, "check DIRTY_OBJECT_PROGRAM index");
+    static_assert(DIRTY_OBJECT_DRAW_ATTACHMENTS == 2, "check DIRTY_OBJECT_DRAW_ATTACHMENTS index");
+    static_assert(DIRTY_OBJECT_VERTEX_ARRAY == 3, "check DIRTY_OBJECT_VERTEX_ARRAY index");
+    static_assert(DIRTY_OBJECT_SAMPLERS == 4, "check DIRTY_OBJECT_SAMPLERS index");
+    static_assert(DIRTY_OBJECT_PROGRAM_TEXTURES == 5, "check DIRTY_OBJECT_PROGRAM_TEXTURES index");
+    static_assert(DIRTY_OBJECT_PROGRAM == 6, "check DIRTY_OBJECT_PROGRAM index");
 
     // Dispatch table for buffer update functions.
     static const angle::PackedEnumMap<BufferBinding, BufferBindingSetter> kBufferSetters;