Return an Error from ContextImpl::syncState.

src/libANGLE/Context.cpp

@@ -3438,7 +3438,7 @@ Error Context::syncState(const State::DirtyBits &bitMask, const State::DirtyObje
 Error Context::syncDirtyBits()
 {
     const State::DirtyBits &dirtyBits = mGLState.getDirtyBits();
-    mImplementation->syncState(this, dirtyBits);
+    ANGLE_TRY(mImplementation->syncState(this, dirtyBits));
     mGLState.clearDirtyBits();
     return NoError();
 }
@@ -3446,7 +3446,7 @@ Error Context::syncDirtyBits()
 Error Context::syncDirtyBits(const State::DirtyBits &bitMask)
 {
     const State::DirtyBits &dirtyBits = (mGLState.getDirtyBits() & bitMask);
-    mImplementation->syncState(this, dirtyBits);
+    ANGLE_TRY(mImplementation->syncState(this, dirtyBits));
     mGLState.clearDirtyBits(dirtyBits);
     return NoError();
 }

src/libANGLE/renderer/ContextImpl.h

@@ -140,7 +140,8 @@ class ContextImpl : public GLImplFactory
     virtual void popDebugGroup()                                                               = 0;
 
     // State sync with dirty bits.
-    virtual void syncState(const gl::Context *context, const gl::State::DirtyBits &dirtyBits) = 0;
+    virtual gl::Error syncState(const gl::Context *context,
+                                const gl::State::DirtyBits &dirtyBits) = 0;
 
     // Disjoint timer queries
     virtual GLint getGPUDisjoint() = 0;

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

@@ -403,9 +403,10 @@ void Context11::popDebugGroup()
     popGroupMarker();
 }
 
-void Context11::syncState(const gl::Context *context, const gl::State::DirtyBits &dirtyBits)
+gl::Error Context11::syncState(const gl::Context *context, const gl::State::DirtyBits &dirtyBits)
 {
     mRenderer->getStateManager()->syncState(context, dirtyBits);
+    return gl::NoError();
 }
 
 GLint Context11::getGPUDisjoint()

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

@@ -120,7 +120,7 @@ class Context11 : public ContextImpl
     void popDebugGroup() override;
 
     // State sync with dirty bits.
-    void syncState(const gl::Context *context, const gl::State::DirtyBits &dirtyBits) override;
+    gl::Error syncState(const gl::Context *context, const gl::State::DirtyBits &dirtyBits) override;
 
     // Disjoint timer queries
     GLint getGPUDisjoint() override;

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

@@ -255,9 +255,10 @@ void Context9::popDebugGroup()
     popGroupMarker();
 }
 
-void Context9::syncState(const gl::Context *context, const gl::State::DirtyBits &dirtyBits)
+gl::Error Context9::syncState(const gl::Context *context, const gl::State::DirtyBits &dirtyBits)
 {
     mRenderer->getStateManager()->syncState(mState.getState(), dirtyBits);
+    return gl::NoError();
 }
 
 GLint Context9::getGPUDisjoint()

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

@@ -120,7 +120,7 @@ class Context9 : public ContextImpl
     void popDebugGroup() override;
 
     // State sync with dirty bits.
-    void syncState(const gl::Context *context, const gl::State::DirtyBits &dirtyBits) override;
+    gl::Error syncState(const gl::Context *context, const gl::State::DirtyBits &dirtyBits) override;
 
     // Disjoint timer queries
     GLint getGPUDisjoint() override;

src/libANGLE/renderer/gl/ContextGL.cpp

@@ -365,9 +365,10 @@ void ContextGL::popDebugGroup()
     mRenderer->popDebugGroup();
 }
 
-void ContextGL::syncState(const gl::Context *context, const gl::State::DirtyBits &dirtyBits)
+gl::Error ContextGL::syncState(const gl::Context *context, const gl::State::DirtyBits &dirtyBits)
 {
     mRenderer->getStateManager()->syncState(context, dirtyBits);
+    return gl::NoError();
 }
 
 GLint ContextGL::getGPUDisjoint()

src/libANGLE/renderer/gl/ContextGL.h

@@ -174,7 +174,7 @@ class ContextGL : public ContextImpl
     void popDebugGroup() override;
 
     // State sync with dirty bits.
-    void syncState(const gl::Context *context, const gl::State::DirtyBits &dirtyBits) override;
+    gl::Error syncState(const gl::Context *context, const gl::State::DirtyBits &dirtyBits) override;
 
     // Disjoint timer queries
     GLint getGPUDisjoint() override;

src/libANGLE/renderer/null/ContextNULL.cpp

@@ -295,8 +295,9 @@ void ContextNULL::popDebugGroup()
 {
 }
 
-void ContextNULL::syncState(const gl::Context *context, const gl::State::DirtyBits &dirtyBits)
+gl::Error ContextNULL::syncState(const gl::Context *context, const gl::State::DirtyBits &dirtyBits)
 {
+    return gl::NoError();
 }
 
 GLint ContextNULL::getGPUDisjoint()

src/libANGLE/renderer/null/ContextNULL.h

@@ -142,7 +142,7 @@ class ContextNULL : public ContextImpl
     void popDebugGroup() override;
 
     // State sync with dirty bits.
-    void syncState(const gl::Context *context, const gl::State::DirtyBits &dirtyBits) override;
+    gl::Error syncState(const gl::Context *context, const gl::State::DirtyBits &dirtyBits) override;
 
     // Disjoint timer queries
     GLint getGPUDisjoint() override;

src/libANGLE/renderer/vulkan/ContextVk.cpp

@@ -414,7 +414,7 @@ void ContextVk::updateScissor(const gl::State &glState)
     }
 }
 
-void ContextVk::syncState(const gl::Context *context, const gl::State::DirtyBits &dirtyBits)
+gl::Error ContextVk::syncState(const gl::Context *context, const gl::State::DirtyBits &dirtyBits)
 {
     if (dirtyBits.any())
     {
@@ -655,6 +655,8 @@ void ContextVk::syncState(const gl::Context *context, const gl::State::DirtyBits
         programVk->invalidateTextures();
         mTexturesDirty = true;
     }
+
+    return gl::NoError();
 }
 
 GLint ContextVk::getGPUDisjoint()

src/libANGLE/renderer/vulkan/ContextVk.h

@@ -90,7 +90,7 @@ class ContextVk : public ContextImpl
     bool isViewportFlipEnabled();
 
     // State sync with dirty bits.
-    void syncState(const gl::Context *context, const gl::State::DirtyBits &dirtyBits) override;
+    gl::Error syncState(const gl::Context *context, const gl::State::DirtyBits &dirtyBits) override;
 
     // Disjoint timer queries
     GLint getGPUDisjoint() override;