Fix synchronization of workaround dirty bits in TextureGL.

src/libANGLE/Texture.cpp

@@ -1131,11 +1131,8 @@ GLuint Texture::getId() const
 
 void Texture::syncImplState()
 {
-    if (mDirtyBits.any())
-    {
-        mTexture->syncState(mDirtyBits);
-        mDirtyBits.reset();
-    }
+    mTexture->syncState(mDirtyBits);
+    mDirtyBits.reset();
 }
 
 rx::FramebufferAttachmentObjectImpl *Texture::getAttachmentImpl() const

src/libANGLE/renderer/gl/StateManagerGL.cpp

@@ -749,7 +749,7 @@ gl::Error StateManagerGL::setGenericDrawState(const gl::ContextState &data)
                 const TextureGL *textureGL = GetImplAs<TextureGL>(texture);
 
                 if (mTextures[textureType][textureUnitIndex] != textureGL->getTextureID() ||
-                    texture->hasAnyDirtyBit())
+                    texture->hasAnyDirtyBit() || textureGL->hasAnyDirtyBit())
                 {
                     activeTexture(textureUnitIndex);
                     bindTexture(textureType, textureGL->getTextureID());

src/libANGLE/renderer/gl/TextureGL.cpp

@@ -800,7 +800,11 @@ gl::Error TextureGL::setEGLImageTarget(GLenum target, egl::Image *image)
 
 void TextureGL::syncState(const gl::Texture::DirtyBits &dirtyBits)
 {
-    ASSERT(dirtyBits.any());
+    if (dirtyBits.none() && mLocalDirtyBits.none())
+    {
+        return;
+    }
+
     mStateManager->bindTexture(mState.mTarget, mTextureID);
 
     if (dirtyBits[gl::Texture::DIRTY_BIT_BASE_LEVEL] || dirtyBits[gl::Texture::DIRTY_BIT_MAX_LEVEL])
@@ -891,6 +895,11 @@ void TextureGL::syncState(const gl::Texture::DirtyBits &dirtyBits)
     mLocalDirtyBits.reset();
 }
 
+bool TextureGL::hasAnyDirtyBit() const
+{
+    return mLocalDirtyBits.any();
+}
+
 void TextureGL::syncTextureStateSwizzle(const FunctionsGL *functions, GLenum name, GLenum value)
 {
     const LevelInfoGL &levelInfo = mLevelInfo[mState.getEffectiveBaseLevel()];
@@ -1009,11 +1018,8 @@ void TextureGL::setLevelInfo(size_t level, size_t levelCount, const LevelInfoGL
     ASSERT(levelCount > 0 && level + levelCount < mLevelInfo.size());
 
     GLuint baseLevel              = mState.getEffectiveBaseLevel();
-    const auto &prevBaseLevelInfo = mLevelInfo[baseLevel];
-    bool needsResync =
-        level <= baseLevel && level + levelCount >= baseLevel &&
-        (prevBaseLevelInfo.depthStencilWorkaround != levelInfo.depthStencilWorkaround ||
-         prevBaseLevelInfo.lumaWorkaround.enabled != levelInfo.lumaWorkaround.enabled);
+    bool needsResync              = level <= baseLevel && level + levelCount >= baseLevel &&
+                       (levelInfo.depthStencilWorkaround || levelInfo.lumaWorkaround.enabled);
     if (needsResync)
     {
         mLocalDirtyBits |= GetLevelWorkaroundDirtyBits();

src/libANGLE/renderer/gl/TextureGL.h

@@ -92,6 +92,7 @@ class TextureGL : public TextureImpl
     void setBaseLevel(GLuint) override {}
 
     void syncState(const gl::Texture::DirtyBits &dirtyBits) override;
+    bool hasAnyDirtyBit() const;
 
   private:
     void setImageHelper(GLenum target,