GL: Apply dirty bit mask on sync state.

src/libANGLE/Context.cpp

@@ -3452,6 +3452,13 @@ void Context::initWorkarounds()
     // Lose the context upon out of memory error if the application is
     // expecting to watch for those events.
     mWorkarounds.loseContextOnOutOfMemory = (mResetStrategy == GL_LOSE_CONTEXT_ON_RESET_EXT);
+
+    if (mWorkarounds.syncFramebufferBindingsOnTexImage)
+    {
+        // Update the Framebuffer bindings on TexImage to work around an Intel bug.
+        mTexImageDirtyBits.set(State::DIRTY_BIT_READ_FRAMEBUFFER_BINDING);
+        mTexImageDirtyBits.set(State::DIRTY_BIT_DRAW_FRAMEBUFFER_BINDING);
+    }
 }
 
 // Return true if the draw is a no-op, else return false.

src/libANGLE/Workarounds.h

@@ -23,6 +23,11 @@ struct Workarounds
     // Program binaries don't contain transform feedback varyings on Qualcomm GPUs.
     // Work around this by disabling the program cache for programs with transform feedback.
     bool disableProgramCachingForTransformFeedback = false;
+
+    // On Windows Intel OpenGL drivers TexImage sometimes seems to interact with the Framebuffer.
+    // Flaky crashes can occur unless we sync the Framebuffer bindings. The workaround is to add
+    // Framebuffer binding dirty bits to TexImage updates. See http://anglebug.com/2906
+    bool syncFramebufferBindingsOnTexImage = false;
 };
 }  // namespace gl
 

src/libANGLE/renderer/gl/StateManagerGL.cpp

@@ -1747,7 +1747,7 @@ void StateManagerGL::syncState(const gl::Context *context,
         mMultiviewDirtyBits.reset();
     }
 
-    const gl::State::DirtyBits &glAndLocalDirtyBits = (glDirtyBits | mLocalDirtyBits);
+    const gl::State::DirtyBits &glAndLocalDirtyBits = (glDirtyBits | mLocalDirtyBits) & bitMask;
 
     if (!glAndLocalDirtyBits.any())
     {
@@ -1939,6 +1939,11 @@ void StateManagerGL::syncState(const gl::Context *context,
             case gl::State::DIRTY_BIT_READ_FRAMEBUFFER_BINDING:
             {
                 gl::Framebuffer *framebuffer = state.getReadFramebuffer();
+
+                // Necessary for an Intel TexImage workaround.
+                if (!framebuffer)
+                    continue;
+
                 FramebufferGL *framebufferGL = GetImplAs<FramebufferGL>(framebuffer);
                 bindFramebuffer(GL_READ_FRAMEBUFFER, framebufferGL->getFramebufferID());
                 break;
@@ -1946,11 +1951,19 @@ void StateManagerGL::syncState(const gl::Context *context,
             case gl::State::DIRTY_BIT_DRAW_FRAMEBUFFER_BINDING:
             {
                 gl::Framebuffer *framebuffer = state.getDrawFramebuffer();
+
+                // Necessary for an Intel TexImage workaround.
+                if (!framebuffer)
+                    continue;
+
                 FramebufferGL *framebufferGL = GetImplAs<FramebufferGL>(framebuffer);
                 bindFramebuffer(GL_DRAW_FRAMEBUFFER, framebufferGL->getFramebufferID());
 
                 const gl::Program *program = state.getProgram();
-                updateMultiviewBaseViewLayerIndexUniform(program, framebufferGL->getState());
+                if (program)
+                {
+                    updateMultiviewBaseViewLayerIndexUniform(program, framebufferGL->getState());
+                }
                 break;
             }
             case gl::State::DIRTY_BIT_RENDERBUFFER_BINDING:
@@ -2070,9 +2083,9 @@ void StateManagerGL::syncState(const gl::Context *context,
                 UNREACHABLE();
                 break;
         }
-
-        mLocalDirtyBits.reset();
     }
+
+    mLocalDirtyBits &= ~(bitMask);
 }
 
 void StateManagerGL::setFramebufferSRGBEnabled(const gl::Context *context, bool enabled)

src/libANGLE/renderer/gl/renderergl_utils.cpp

@@ -1243,14 +1243,22 @@ void GenerateWorkarounds(const FunctionsGL *functions, WorkaroundsGL *workaround
 
 void ApplyWorkarounds(const FunctionsGL *functions, gl::Workarounds *workarounds)
 {
-#if defined(ANGLE_PLATFORM_ANDROID)
     VendorID vendor = GetVendorID(functions);
+    ANGLE_UNUSED_VARIABLE(vendor);
 
+#if defined(ANGLE_PLATFORM_ANDROID)
     if (IsQualcomm(vendor))
     {
         workarounds->disableProgramCachingForTransformFeedback = true;
     }
 #endif  // defined(ANGLE_PLATFORM_ANDROID)
+
+#if defined(ANGLE_PLATFORM_WINDOWS)
+    if (IsIntel(vendor))
+    {
+        workarounds->syncFramebufferBindingsOnTexImage = true;
+    }
+#endif  // defined(ANGLE_PLATFORM_WINDOWS)
 }
 
 }  // namespace nativegl_gl