Return gl::Error from VertexArray::syncState().

src/libANGLE/State.cpp

@@ -2501,7 +2501,7 @@ Error State::syncDirtyObjects(const Context *context, const DirtyObjects &bitset
                 break;
             case DIRTY_OBJECT_VERTEX_ARRAY:
                 ASSERT(mVertexArray);
-                mVertexArray->syncState(context);
+                ANGLE_TRY(mVertexArray->syncState(context));
                 break;
             case DIRTY_OBJECT_PROGRAM_TEXTURES:
                 syncProgramTextures(context);

src/libANGLE/VertexArray.cpp

@@ -270,11 +270,12 @@ void VertexArray::setElementArrayBuffer(const Context *context, Buffer *buffer)
     mDirtyBits.set(DIRTY_BIT_ELEMENT_ARRAY_BUFFER);
 }
 
-void VertexArray::syncState(const Context *context)
+gl::Error VertexArray::syncState(const Context *context)
 {
     if (mDirtyBits.any())
     {
-        mVertexArray->syncState(context, mDirtyBits, mDirtyAttribBits, mDirtyBindingBits);
+        ANGLE_TRY(
+            mVertexArray->syncState(context, mDirtyBits, mDirtyAttribBits, mDirtyBindingBits));
         mDirtyBits.reset();
 
         // This is a bit of an implementation hack - but since we know the implementation
@@ -284,6 +285,7 @@ void VertexArray::syncState(const Context *context)
         memset(&mDirtyAttribBits, 0, sizeof(mDirtyAttribBits));
         memset(&mDirtyBindingBits, 0, sizeof(mDirtyBindingBits));
     }
+    return gl::NoError();
 }
 
 void VertexArray::onBindingChanged(bool bound)

src/libANGLE/VertexArray.h

@@ -204,7 +204,7 @@ class VertexArray final : public LabeledObject
 
     static size_t GetVertexIndexFromDirtyBit(size_t dirtyBit);
 
-    void syncState(const Context *context);
+    gl::Error syncState(const Context *context);
     bool hasAnyDirtyBit() const { return mDirtyBits.any(); }
 
     ComponentTypeMask getAttributesTypeMask() const { return mState.mVertexAttributesTypeMask; }

src/libANGLE/renderer/VertexArrayImpl.h

@@ -21,11 +21,12 @@ class VertexArrayImpl : angle::NonCopyable
 {
   public:
     VertexArrayImpl(const gl::VertexArrayState &state) : mState(state) {}
-    virtual void syncState(const gl::Context *context,
-                           const gl::VertexArray::DirtyBits &dirtyBits,
-                           const gl::VertexArray::DirtyAttribBitsArray &attribBits,
-                           const gl::VertexArray::DirtyBindingBitsArray &bindingBits)
+    virtual gl::Error syncState(const gl::Context *context,
+                                const gl::VertexArray::DirtyBits &dirtyBits,
+                                const gl::VertexArray::DirtyAttribBitsArray &attribBits,
+                                const gl::VertexArray::DirtyBindingBitsArray &bindingBits)
     {
+        return gl::NoError();
     }
 
     virtual void destroy(const gl::Context *context) {}

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

@@ -56,10 +56,10 @@ void VertexArray11::destroy(const gl::Context *context)
     mCurrentElementArrayBuffer.set(context, nullptr);
 }
 
-void VertexArray11::syncState(const gl::Context *context,
-                              const gl::VertexArray::DirtyBits &dirtyBits,
-                              const gl::VertexArray::DirtyAttribBitsArray &attribBits,
-                              const gl::VertexArray::DirtyBindingBitsArray &bindingBits)
+gl::Error VertexArray11::syncState(const gl::Context *context,
+                                   const gl::VertexArray::DirtyBits &dirtyBits,
+                                   const gl::VertexArray::DirtyAttribBitsArray &attribBits,
+                                   const gl::VertexArray::DirtyBindingBitsArray &bindingBits)
 {
     ASSERT(dirtyBits.any());
 
@@ -86,6 +86,8 @@ void VertexArray11::syncState(const gl::Context *context,
             mAttribsToUpdate.set(index);
         }
     }
+
+    return gl::NoError();
 }
 
 bool VertexArray11::flushAttribUpdates(const gl::Context *context)

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

@@ -26,10 +26,10 @@ class VertexArray11 : public angle::ObserverInterface, public VertexArrayImpl
     ~VertexArray11() override;
     void destroy(const gl::Context *context) override;
 
-    void syncState(const gl::Context *context,
-                   const gl::VertexArray::DirtyBits &dirtyBits,
-                   const gl::VertexArray::DirtyAttribBitsArray &attribBits,
-                   const gl::VertexArray::DirtyBindingBitsArray &bindingBits) override;
+    gl::Error syncState(const gl::Context *context,
+                        const gl::VertexArray::DirtyBits &dirtyBits,
+                        const gl::VertexArray::DirtyAttribBitsArray &attribBits,
+                        const gl::VertexArray::DirtyBindingBitsArray &bindingBits) override;
     // This will flush any pending attrib updates and then check the dynamic attribs mask.
     bool hasActiveDynamicAttrib(const gl::Context *context);
     gl::Error updateDirtyAndDynamicAttribs(const gl::Context *context,

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

@@ -23,10 +23,10 @@ class VertexArray9 : public VertexArrayImpl
   public:
     VertexArray9(const gl::VertexArrayState &data) : VertexArrayImpl(data) {}
 
-    void syncState(const gl::Context *context,
-                   const gl::VertexArray::DirtyBits &dirtyBits,
-                   const gl::VertexArray::DirtyAttribBitsArray &attribBits,
-                   const gl::VertexArray::DirtyBindingBitsArray &bindingBits) override;
+    gl::Error syncState(const gl::Context *context,
+                        const gl::VertexArray::DirtyBits &dirtyBits,
+                        const gl::VertexArray::DirtyAttribBitsArray &attribBits,
+                        const gl::VertexArray::DirtyBindingBitsArray &bindingBits) override;
 
     ~VertexArray9() override {}
 
@@ -36,14 +36,15 @@ class VertexArray9 : public VertexArrayImpl
     Serial mCurrentStateSerial;
 };
 
-inline void VertexArray9::syncState(const gl::Context *context,
-                                    const gl::VertexArray::DirtyBits &dirtyBits,
-                                    const gl::VertexArray::DirtyAttribBitsArray &attribBits,
-                                    const gl::VertexArray::DirtyBindingBitsArray &bindingBits)
+inline gl::Error VertexArray9::syncState(const gl::Context *context,
+                                         const gl::VertexArray::DirtyBits &dirtyBits,
+                                         const gl::VertexArray::DirtyAttribBitsArray &attribBits,
+                                         const gl::VertexArray::DirtyBindingBitsArray &bindingBits)
 {
     ASSERT(dirtyBits.any());
     Renderer9 *renderer = GetImplAs<Context9>(context)->getRenderer();
     mCurrentStateSerial = renderer->generateSerial();
+    return gl::NoError();
 }
 }  // namespace rx
 

src/libANGLE/renderer/gl/VertexArrayGL.cpp

@@ -701,10 +701,10 @@ void VertexArrayGL::syncDirtyBinding(const gl::Context *context,
     }
 }
 
-void VertexArrayGL::syncState(const gl::Context *context,
-                              const VertexArray::DirtyBits &dirtyBits,
-                              const gl::VertexArray::DirtyAttribBitsArray &attribBits,
-                              const gl::VertexArray::DirtyBindingBitsArray &bindingBits)
+gl::Error VertexArrayGL::syncState(const gl::Context *context,
+                                   const VertexArray::DirtyBits &dirtyBits,
+                                   const gl::VertexArray::DirtyAttribBitsArray &attribBits,
+                                   const gl::VertexArray::DirtyBindingBitsArray &bindingBits)
 {
     mStateManager->bindVertexArray(mVertexArrayID, getAppliedElementArrayBufferID());
 
@@ -734,6 +734,8 @@ void VertexArrayGL::syncState(const gl::Context *context,
             }
         }
     }
+
+    return gl::NoError();
 }
 
 void VertexArrayGL::applyNumViewsToDivisor(int numViews)

src/libANGLE/renderer/gl/VertexArrayGL.h

@@ -44,10 +44,10 @@ class VertexArrayGL : public VertexArrayImpl
     GLuint getVertexArrayID() const;
     GLuint getAppliedElementArrayBufferID() const;
 
-    void syncState(const gl::Context *context,
-                   const gl::VertexArray::DirtyBits &dirtyBits,
-                   const gl::VertexArray::DirtyAttribBitsArray &attribBits,
-                   const gl::VertexArray::DirtyBindingBitsArray &bindingBits) override;
+    gl::Error syncState(const gl::Context *context,
+                        const gl::VertexArray::DirtyBits &dirtyBits,
+                        const gl::VertexArray::DirtyAttribBitsArray &attribBits,
+                        const gl::VertexArray::DirtyBindingBitsArray &bindingBits) override;
 
     void applyNumViewsToDivisor(int numViews);
 

src/libANGLE/renderer/vulkan/VertexArrayVk.cpp

@@ -93,10 +93,10 @@ gl::Error VertexArrayVk::streamVertexData(ContextVk *context,
     return gl::NoError();
 }
 
-void VertexArrayVk::syncState(const gl::Context *context,
-                              const gl::VertexArray::DirtyBits &dirtyBits,
-                              const gl::VertexArray::DirtyAttribBitsArray &attribBits,
-                              const gl::VertexArray::DirtyBindingBitsArray &bindingBits)
+gl::Error VertexArrayVk::syncState(const gl::Context *context,
+                                   const gl::VertexArray::DirtyBits &dirtyBits,
+                                   const gl::VertexArray::DirtyAttribBitsArray &attribBits,
+                                   const gl::VertexArray::DirtyBindingBitsArray &bindingBits)
 {
     ASSERT(dirtyBits.any());
 
@@ -159,6 +159,8 @@ void VertexArrayVk::syncState(const gl::Context *context,
             UNIMPLEMENTED();
         }
     }
+
+    return gl::NoError();
 }
 
 const gl::AttribArray<VkBuffer> &VertexArrayVk::getCurrentArrayBufferHandles() const

src/libANGLE/renderer/vulkan/VertexArrayVk.h

@@ -31,10 +31,10 @@ class VertexArrayVk : public VertexArrayImpl
                                StreamingBuffer *stream,
                                size_t firstVertex,
                                size_t lastVertex);
-    void syncState(const gl::Context *context,
-                   const gl::VertexArray::DirtyBits &dirtyBits,
-                   const gl::VertexArray::DirtyAttribBitsArray &attribBits,
-                   const gl::VertexArray::DirtyBindingBitsArray &bindingBits) override;
+    gl::Error syncState(const gl::Context *context,
+                        const gl::VertexArray::DirtyBits &dirtyBits,
+                        const gl::VertexArray::DirtyAttribBitsArray &attribBits,
+                        const gl::VertexArray::DirtyBindingBitsArray &bindingBits) override;
 
     const gl::AttribArray<VkBuffer> &getCurrentArrayBufferHandles() const;
     const gl::AttribArray<VkDeviceSize> &getCurrentArrayBufferOffsets() const;