Pass binding enum to Framebuffer::syncState.

src/libANGLE/Framebuffer.cpp

@@ -1140,7 +1140,9 @@ GLenum Framebuffer::checkStatusImpl(const Context *context) const
         // We can skip syncState on several back-ends.
         if (mImpl->shouldSyncStateBeforeCheckStatus())
         {
-            angle::Result err = syncState(context);
+            // This binding is not totally correct. It is ok because the parameter isn't used in
+            // the GL back-end and the GL back-end is the only user of syncStateBeforeCheckStatus.
+            angle::Result err = syncState(context, GL_FRAMEBUFFER);
             if (err != angle::Result::Continue)
             {
                 return 0;
@@ -1972,12 +1974,12 @@ void Framebuffer::resetAttachment(const Context *context, GLenum binding)
     setAttachment(context, GL_NONE, binding, ImageIndex(), nullptr);
 }
 
-angle::Result Framebuffer::syncState(const Context *context) const
+angle::Result Framebuffer::syncState(const Context *context, GLenum framebufferBinding) const
 {
     if (mDirtyBits.any())
     {
         mDirtyBitsGuard = mDirtyBits;
-        ANGLE_TRY(mImpl->syncState(context, mDirtyBits));
+        ANGLE_TRY(mImpl->syncState(context, framebufferBinding, mDirtyBits));
         mDirtyBits.reset();
         mDirtyBitsGuard.reset();
     }

src/libANGLE/Framebuffer.h

@@ -389,7 +389,7 @@ class Framebuffer final : public angle::ObserverInterface,
 
     bool hasResourceThatNeedsInit() const { return mState.mResourceNeedsInit.any(); }
 
-    angle::Result syncState(const Context *context) const;
+    angle::Result syncState(const Context *context, GLenum framebufferBinding) const;
 
     // Observer implementation
     void onSubjectStateChange(angle::SubjectIndex index, angle::SubjectMessage message) override;

src/libANGLE/State.cpp

@@ -3008,13 +3008,13 @@ angle::Result State::syncDrawAttachments(const Context *context)
 angle::Result State::syncReadFramebuffer(const Context *context)
 {
     ASSERT(mReadFramebuffer);
-    return mReadFramebuffer->syncState(context);
+    return mReadFramebuffer->syncState(context, GL_READ_FRAMEBUFFER);
 }
 
 angle::Result State::syncDrawFramebuffer(const Context *context)
 {
     ASSERT(mDrawFramebuffer);
-    return mDrawFramebuffer->syncState(context);
+    return mDrawFramebuffer->syncState(context, GL_DRAW_FRAMEBUFFER);
 }
 
 angle::Result State::syncTextures(const Context *context)

src/libANGLE/renderer/FramebufferImpl.h

@@ -80,6 +80,7 @@ class FramebufferImpl : angle::NonCopyable
     virtual bool checkStatus(const gl::Context *context) const = 0;
 
     virtual angle::Result syncState(const gl::Context *context,
+                                    GLenum binding,
                                     const gl::Framebuffer::DirtyBits &dirtyBits) = 0;
 
     virtual angle::Result getSamplePosition(const gl::Context *context,

src/libANGLE/renderer/FramebufferImpl_mock.h

@@ -48,7 +48,8 @@ class MockFramebufferImpl : public rx::FramebufferImpl
 
     MOCK_CONST_METHOD1(checkStatus, bool(const gl::Context *));
 
-    MOCK_METHOD2(syncState, angle::Result(const gl::Context *, const gl::Framebuffer::DirtyBits &));
+    MOCK_METHOD3(syncState,
+                 angle::Result(const gl::Context *, GLenum, const gl::Framebuffer::DirtyBits &));
 
     MOCK_METHOD0(destructor, void());
 };

src/libANGLE/renderer/d3d/FramebufferD3D.cpp

@@ -268,6 +268,7 @@ bool FramebufferD3D::checkStatus(const gl::Context *context) const
 }
 
 angle::Result FramebufferD3D::syncState(const gl::Context *context,
+                                        GLenum binding,
                                         const gl::Framebuffer::DirtyBits &dirtyBits)
 {
     if (!mColorAttachmentsForRender.valid())

src/libANGLE/renderer/d3d/FramebufferD3D.h

@@ -96,6 +96,7 @@ class FramebufferD3D : public FramebufferImpl
     bool checkStatus(const gl::Context *context) const override;
 
     angle::Result syncState(const gl::Context *context,
+                            GLenum binding,
                             const gl::Framebuffer::DirtyBits &dirtyBits) override;
 
     const gl::AttachmentList &getColorAttachmentsForRender(const gl::Context *context);

src/libANGLE/renderer/d3d/d3d11/Framebuffer11.cpp

@@ -386,10 +386,11 @@ const gl::InternalFormat &Framebuffer11::getImplementationColorReadFormat(
 }
 
 angle::Result Framebuffer11::syncState(const gl::Context *context,
+                                       GLenum binding,
                                        const gl::Framebuffer::DirtyBits &dirtyBits)
 {
     ANGLE_TRY(mRenderTargetCache.update(context, mState, dirtyBits));
-    ANGLE_TRY(FramebufferD3D::syncState(context, dirtyBits));
+    ANGLE_TRY(FramebufferD3D::syncState(context, binding, dirtyBits));
 
     // Call this last to allow the state manager to take advantage of the cached render targets.
     mRenderer->getStateManager()->invalidateRenderTarget();

src/libANGLE/renderer/d3d/d3d11/Framebuffer11.h

@@ -39,6 +39,7 @@ class Framebuffer11 : public FramebufferD3D
     angle::Result markAttachmentsDirty(const gl::Context *context) const;
 
     angle::Result syncState(const gl::Context *context,
+                            GLenum binding,
                             const gl::Framebuffer::DirtyBits &dirtyBits) override;
 
     const gl::AttachmentArray<RenderTarget11 *> &getCachedColorRenderTargets() const

src/libANGLE/renderer/d3d/d3d9/Framebuffer9.cpp

@@ -404,9 +404,10 @@ angle::Result Framebuffer9::getSamplePosition(const gl::Context *context,
 }
 
 angle::Result Framebuffer9::syncState(const gl::Context *context,
+                                      GLenum binding,
                                       const gl::Framebuffer::DirtyBits &dirtyBits)
 {
-    ANGLE_TRY(FramebufferD3D::syncState(context, dirtyBits));
+    ANGLE_TRY(FramebufferD3D::syncState(context, binding, dirtyBits));
     ANGLE_TRY(mRenderTargetCache.update(context, mState, dirtyBits));
     return angle::Result::Continue;
 }

src/libANGLE/renderer/d3d/d3d9/Framebuffer9.h

@@ -39,6 +39,7 @@ class Framebuffer9 : public FramebufferD3D
                                     GLfloat *xy) const override;
 
     angle::Result syncState(const gl::Context *context,
+                            GLenum binding,
                             const gl::Framebuffer::DirtyBits &dirtyBits) override;
 
     const gl::AttachmentArray<RenderTarget9 *> &getCachedColorRenderTargets() const

src/libANGLE/renderer/gl/FramebufferGL.cpp

@@ -1185,6 +1185,7 @@ bool FramebufferGL::checkStatus(const gl::Context *context) const
 }
 
 angle::Result FramebufferGL::syncState(const gl::Context *context,
+                                       GLenum binding,
                                        const gl::Framebuffer::DirtyBits &dirtyBits)
 {
     // Don't need to sync state for the default FBO.

src/libANGLE/renderer/gl/FramebufferGL.h

@@ -80,6 +80,7 @@ class FramebufferGL : public FramebufferImpl
     bool checkStatus(const gl::Context *context) const override;
 
     angle::Result syncState(const gl::Context *context,
+                            GLenum binding,
                             const gl::Framebuffer::DirtyBits &dirtyBits) override;
 
     GLuint getFramebufferID() const;

src/libANGLE/renderer/metal/FrameBufferMtl.h

@@ -75,6 +75,7 @@ class FramebufferMtl : public FramebufferImpl
     bool checkStatus(const gl::Context *context) const override;
 
     angle::Result syncState(const gl::Context *context,
+                            GLenum binding,
                             const gl::Framebuffer::DirtyBits &dirtyBits) override;
 
     angle::Result getSamplePosition(const gl::Context *context,

src/libANGLE/renderer/metal/FrameBufferMtl.mm

@@ -225,6 +225,7 @@ bool FramebufferMtl::checkStatus(const gl::Context *context) const
 }
 
 angle::Result FramebufferMtl::syncState(const gl::Context *context,
+                                        GLenum binding,
                                         const gl::Framebuffer::DirtyBits &dirtyBits)
 {
     ContextMtl *contextMtl = mtl::GetImpl(context);

src/libANGLE/renderer/metal/SurfaceMtl.mm

@@ -549,7 +549,7 @@ angle::Result SurfaceMtl::obtainNextDrawable(const gl::Context *context)
         if (defaultFbo)
         {
             FramebufferMtl *framebufferMtl = mtl::GetImpl(defaultFbo);
-            ANGLE_TRY(framebufferMtl->syncState(context, fboDirtyBits));
+            ANGLE_TRY(framebufferMtl->syncState(context, GL_FRAMEBUFFER, fboDirtyBits));
         }
 
         return angle::Result::Continue;

src/libANGLE/renderer/null/FramebufferNULL.cpp

@@ -159,6 +159,7 @@ bool FramebufferNULL::checkStatus(const gl::Context *context) const
 }
 
 angle::Result FramebufferNULL::syncState(const gl::Context *context,
+                                         GLenum binding,
                                          const gl::Framebuffer::DirtyBits &dirtyBits)
 {
     return angle::Result::Continue;

src/libANGLE/renderer/null/FramebufferNULL.h

@@ -66,6 +66,7 @@ class FramebufferNULL : public FramebufferImpl
     bool checkStatus(const gl::Context *context) const override;
 
     angle::Result syncState(const gl::Context *context,
+                            GLenum binding,
                             const gl::Framebuffer::DirtyBits &dirtyBits) override;
 
     angle::Result getSamplePosition(const gl::Context *context,

src/libANGLE/renderer/vulkan/FramebufferVk.cpp

@@ -1042,6 +1042,7 @@ void FramebufferVk::updateDepthStencilAttachmentSerial(ContextVk *contextVk)
 }
 
 angle::Result FramebufferVk::syncState(const gl::Context *context,
+                                       GLenum binding,
                                        const gl::Framebuffer::DirtyBits &dirtyBits)
 {
     ContextVk *contextVk = vk::GetImpl(context);

src/libANGLE/renderer/vulkan/FramebufferVk.h

@@ -86,6 +86,7 @@ class FramebufferVk : public FramebufferImpl
     bool checkStatus(const gl::Context *context) const override;
 
     angle::Result syncState(const gl::Context *context,
+                            GLenum binding,
                             const gl::Framebuffer::DirtyBits &dirtyBits) override;
 
     angle::Result getSamplePosition(const gl::Context *context,