Return errors from gl::State::syncDirtyObjects.

This plumbs the front-end code, but doesn't implement Error handling for any objects yet. Framebuffers and VertexArrays will get error handling from their syncState methods. Bug: angleproject:2372 Change-Id: I226049e25ac7af2bdd3c4787b67a5d297c0b9c4b Reviewed-on: https://chromium-review.googlesource.com/954289 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: Luc Ferron <lucferron@chromium.org> Reviewed-by: Geoff Lang <geofflang@chromium.org>

Return errors from gl::State::syncDirtyObjects.
bc918e7d · Jamie Madill · Commit Bot · 5164b797 · bc918e7d · bc918e7d
Commit bc918e7d authored Mar 08, 2018 by Jamie Madill Committed by Commit Bot Mar 08, 2018
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 16 additions and 15 deletions

Context.cpp src/libANGLE/Context.cpp +0 -0

Context.h src/libANGLE/Context.h +6 -6

State.cpp src/libANGLE/State.cpp +7 -6

State.h src/libANGLE/State.h +3 -3

No files found.
--- a/src/libANGLE/Context.cpp
+++ b/src/libANGLE/Context.cpp
--- a/src/libANGLE/Context.h
+++ b/src/libANGLE/Context.h
@@ -1166,12 +1166,12 @@ class Context final : public ValidationContext

  private:
    Error prepareForDraw();
-    void syncRendererState();
-    void syncRendererState(const State::DirtyBits &bitMask, const State::DirtyObjects &objectMask);
-    void syncStateForReadPixels();
-    void syncStateForTexImage();
-    void syncStateForClear();
-    void syncStateForBlit();
+    Error syncRendererState();
+    Error syncRendererState(const State::DirtyBits &bitMask, const State::DirtyObjects &objectMask);
+    Error syncStateForReadPixels();
+    Error syncStateForTexImage();
+    Error syncStateForClear();
+    Error syncStateForBlit();
    VertexArray *checkVertexArrayAllocation(GLuint vertexArrayHandle);
    TransformFeedback *checkTransformFeedbackAllocation(GLuint transformFeedback);


--- a/src/libANGLE/State.cpp
+++ b/src/libANGLE/State.cpp
@@ -2227,15 +2227,15 @@ bool State::hasMappedBuffer(BufferBinding target) const
    }
 }

-void State::syncDirtyObjects(const Context *context)
+Error State::syncDirtyObjects(const Context *context)
 {
    if (!mDirtyObjects.any())
-        return;
+        return NoError();

-    syncDirtyObjects(context, mDirtyObjects);
+    return syncDirtyObjects(context, mDirtyObjects);
 }

-void State::syncDirtyObjects(const Context *context, const DirtyObjects &bitset)
+Error State::syncDirtyObjects(const Context *context, const DirtyObjects &bitset)
 {
    for (auto dirtyObject : bitset)
    {
@@ -2264,6 +2264,7 @@ void State::syncDirtyObjects(const Context *context, const DirtyObjects &bitset)
    }

    mDirtyObjects &= ~bitset;
+    return NoError();
 }

 void State::syncProgramTextures(const Context *context)
@@ -2341,7 +2342,7 @@ void State::syncProgramTextures(const Context *context)
    }
 }

-void State::syncDirtyObject(const Context *context, GLenum target)
+Error State::syncDirtyObject(const Context *context, GLenum target)
 {
    DirtyObjects localSet;

@@ -2367,7 +2368,7 @@ void State::syncDirtyObject(const Context *context, GLenum target)
            break;
    }

-    syncDirtyObjects(context, localSet);
+    return syncDirtyObjects(context, localSet);
 }

 void State::setObjectDirty(GLenum target)

--- a/src/libANGLE/State.h
+++ b/src/libANGLE/State.h
@@ -440,9 +440,9 @@ class State : public angle::ObserverInterface, angle::NonCopyable
    using DirtyObjects = angle::BitSet<DIRTY_OBJECT_MAX>;
    void clearDirtyObjects() { mDirtyObjects.reset(); }
    void setAllDirtyObjects() { mDirtyObjects.set(); }
-    void syncDirtyObjects(const Context *context);
-    void syncDirtyObjects(const Context *context, const DirtyObjects &bitset);
-    void syncDirtyObject(const Context *context, GLenum target);
+    Error syncDirtyObjects(const Context *context);
+    Error syncDirtyObjects(const Context *context, const DirtyObjects &bitset);
+    Error syncDirtyObject(const Context *context, GLenum target);
    void setObjectDirty(GLenum target);
    void setFramebufferDirty(const Framebuffer *framebuffer) const;