Add a few missing dirty bit cases.

src/libANGLE/Context.cpp

@@ -861,6 +861,10 @@ void Context::objectLabel(GLenum identifier, GLuint name, GLsizei length, const
 
     std::string labelName = GetObjectLabelFromPointer(length, label);
     object->setLabel(labelName);
+
+    // TODO(jmadill): Determine if the object is dirty based on 'name'. Conservatively assume the
+    // specified object is active until we do this.
+    mGLState.setObjectDirty(identifier);
 }
 
 void Context::objectPtrLabel(const void *ptr, GLsizei length, const GLchar *label)

src/libANGLE/Framebuffer.cpp

@@ -597,22 +597,27 @@ const std::string &Framebuffer::getLabel() const
     return mState.mLabel;
 }
 
-void Framebuffer::detachTexture(const Context *context, GLuint textureId)
+bool Framebuffer::detachTexture(const Context *context, GLuint textureId)
 {
-    detachResourceById(context, GL_TEXTURE, textureId);
+    return detachResourceById(context, GL_TEXTURE, textureId);
 }
 
-void Framebuffer::detachRenderbuffer(const Context *context, GLuint renderbufferId)
+bool Framebuffer::detachRenderbuffer(const Context *context, GLuint renderbufferId)
 {
-    detachResourceById(context, GL_RENDERBUFFER, renderbufferId);
+    return detachResourceById(context, GL_RENDERBUFFER, renderbufferId);
 }
 
-void Framebuffer::detachResourceById(const Context *context, GLenum resourceType, GLuint resourceId)
+bool Framebuffer::detachResourceById(const Context *context, GLenum resourceType, GLuint resourceId)
 {
+    bool found = false;
+
     for (size_t colorIndex = 0; colorIndex < mState.mColorAttachments.size(); ++colorIndex)
     {
-        detachMatchingAttachment(context, &mState.mColorAttachments[colorIndex], resourceType,
-                                 resourceId, DIRTY_BIT_COLOR_ATTACHMENT_0 + colorIndex);
+        if (detachMatchingAttachment(context, &mState.mColorAttachments[colorIndex], resourceType,
+                                     resourceId, DIRTY_BIT_COLOR_ATTACHMENT_0 + colorIndex))
+        {
+            found = true;
+        }
     }
 
     if (context->isWebGL1())
@@ -626,19 +631,28 @@ void Framebuffer::detachResourceById(const Context *context, GLenum resourceType
                 attachment->id() == resourceId)
             {
                 resetAttachment(context, attachment->getBinding());
+                found = true;
             }
         }
     }
     else
     {
-        detachMatchingAttachment(context, &mState.mDepthAttachment, resourceType, resourceId,
-                                 DIRTY_BIT_DEPTH_ATTACHMENT);
-        detachMatchingAttachment(context, &mState.mStencilAttachment, resourceType, resourceId,
-                                 DIRTY_BIT_STENCIL_ATTACHMENT);
+        if (detachMatchingAttachment(context, &mState.mDepthAttachment, resourceType, resourceId,
+                                     DIRTY_BIT_DEPTH_ATTACHMENT))
+        {
+            found = true;
+        }
+        if (detachMatchingAttachment(context, &mState.mStencilAttachment, resourceType, resourceId,
+                                     DIRTY_BIT_STENCIL_ATTACHMENT))
+        {
+            found = true;
+        }
     }
+
+    return found;
 }
 
-void Framebuffer::detachMatchingAttachment(const Context *context,
+bool Framebuffer::detachMatchingAttachment(const Context *context,
                                            FramebufferAttachment *attachment,
                                            GLenum matchType,
                                            GLuint matchId,
@@ -648,7 +662,10 @@ void Framebuffer::detachMatchingAttachment(const Context *context,
     {
         attachment->detach(context);
         mDirtyBits.set(dirtyBit);
+        return true;
     }
+
+    return false;
 }
 
 const FramebufferAttachment *Framebuffer::getColorbuffer(size_t colorAttachment) const

src/libANGLE/Framebuffer.h

@@ -169,8 +169,8 @@ class Framebuffer final : public LabeledObject, public OnAttachmentDirtyReceiver
                                           const GLint *viewportOffsets);
     void resetAttachment(const Context *context, GLenum binding);
 
-    void detachTexture(const Context *context, GLuint texture);
-    void detachRenderbuffer(const Context *context, GLuint renderbuffer);
+    bool detachTexture(const Context *context, GLuint texture);
+    bool detachRenderbuffer(const Context *context, GLuint renderbuffer);
 
     const FramebufferAttachment *getColorbuffer(size_t colorAttachment) const;
     const FramebufferAttachment *getDepthbuffer() const;
@@ -308,8 +308,8 @@ class Framebuffer final : public LabeledObject, public OnAttachmentDirtyReceiver
                                       GLint copyTextureLayer) const;
 
   private:
-    void detachResourceById(const Context *context, GLenum resourceType, GLuint resourceId);
-    void detachMatchingAttachment(const Context *context,
+    bool detachResourceById(const Context *context, GLenum resourceType, GLuint resourceId);
+    bool detachMatchingAttachment(const Context *context,
                                   FramebufferAttachment *attachment,
                                   GLenum matchType,
                                   GLuint matchId,

src/libANGLE/Sampler.h

@@ -79,6 +79,6 @@ class Sampler final : public RefCountObject, public LabeledObject
     SamplerState mSamplerState;
 };
 
-}
+}  // namespace gl
 
 #endif // LIBANGLE_SAMPLER_H_

src/libANGLE/State.cpp

@@ -197,9 +197,9 @@ void State::initialize(const Context *context,
 
 void State::reset(const Context *context)
 {
-    for (TextureBindingMap::iterator bindingVec = mSamplerTextures.begin(); bindingVec != mSamplerTextures.end(); bindingVec++)
+    for (auto &bindingVec : mSamplerTextures)
     {
-        TextureBindingVector &textureVector = bindingVec->second;
+        TextureBindingVector &textureVector = bindingVec.second;
         for (size_t textureIdx = 0; textureIdx < textureVector.size(); textureIdx++)
         {
             textureVector[textureIdx].set(context, nullptr);
@@ -834,14 +834,14 @@ void State::detachTexture(const Context *context, const TextureMap &zeroTextures
     // as if Texture2DAttachment had been called, with a texture of 0, for each attachment point to which this
     // image was attached in the currently bound framebuffer.
 
-    if (mReadFramebuffer)
+    if (mReadFramebuffer && mReadFramebuffer->detachTexture(context, texture))
     {
-        mReadFramebuffer->detachTexture(context, texture);
+        mDirtyObjects.set(DIRTY_OBJECT_READ_FRAMEBUFFER);
     }
 
-    if (mDrawFramebuffer)
+    if (mDrawFramebuffer && mDrawFramebuffer->detachTexture(context, texture))
     {
-        mDrawFramebuffer->detachTexture(context, texture);
+        mDirtyObjects.set(DIRTY_OBJECT_DRAW_FRAMEBUFFER);
     }
 }
 
@@ -893,6 +893,7 @@ void State::detachSampler(const Context *context, GLuint sampler)
 void State::setRenderbufferBinding(const Context *context, Renderbuffer *renderbuffer)
 {
     mRenderbuffer.set(context, renderbuffer);
+    mDirtyBits.set(DIRTY_BIT_RENDERBUFFER_BINDING);
 }
 
 GLuint State::getRenderbufferId() const
@@ -913,7 +914,7 @@ void State::detachRenderbuffer(const Context *context, GLuint renderbuffer)
 
     if (mRenderbuffer.id() == renderbuffer)
     {
-        mRenderbuffer.set(context, nullptr);
+        setRenderbufferBinding(context, nullptr);
     }
 
     // [OpenGL ES 2.0.24] section 4.4 page 111:
@@ -924,14 +925,17 @@ void State::detachRenderbuffer(const Context *context, GLuint renderbuffer)
     Framebuffer *readFramebuffer = mReadFramebuffer;
     Framebuffer *drawFramebuffer = mDrawFramebuffer;
 
-    if (readFramebuffer)
+    if (readFramebuffer && readFramebuffer->detachRenderbuffer(context, renderbuffer))
     {
-        readFramebuffer->detachRenderbuffer(context, renderbuffer);
+        mDirtyObjects.set(DIRTY_OBJECT_READ_FRAMEBUFFER);
     }
 
     if (drawFramebuffer && drawFramebuffer != readFramebuffer)
     {
-        drawFramebuffer->detachRenderbuffer(context, renderbuffer);
+        if (drawFramebuffer->detachRenderbuffer(context, renderbuffer))
+        {
+            mDirtyObjects.set(DIRTY_OBJECT_DRAW_FRAMEBUFFER);
+        }
     }
 
 }

src/libANGLE/Texture.h

@@ -445,6 +445,6 @@ inline bool operator!=(const TextureState &a, const TextureState &b)
 {
     return !(a == b);
 }
-}
+}  // namespace gl
 
 #endif  // LIBANGLE_TEXTURE_H_