No-op incomplete framebuffer invalidation.

It's always legal in GL to no-op framebuffer invalidation. When the FBO is incomplete we can't pull RTs safely so no-oping incomplete invalidate calls saves us from fuzzer bugs and crashes. Bug: angleproject:3971 Change-Id: Ide550a22e6c17a28e5042165831dd684567d81fe Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2227038 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: Geoff Lang <geofflang@chromium.org> Reviewed-by: Jonah Ryan-Davis <jonahr@google.com>

No-op incomplete framebuffer invalidation.
98865915 · Jamie Madill · Commit Bot · 3ecaa283 · 98865915 · 98865915
Commit 98865915 authored Jun 02, 2020 by Jamie Madill Committed by Commit Bot Jun 03, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 6 deletions

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

FramebufferTest.cpp src/tests/gl_tests/FramebufferTest.cpp +0 -3

No files found.
--- a/src/libANGLE/Context.cpp
+++ b/src/libANGLE/Context.cpp
@@ -4068,17 +4068,17 @@ void Context::invalidateFramebuffer(GLenum target,
                                    GLsizei numAttachments,
                                    const GLenum *attachments)
 {
-    // Only sync the FBO
-    ANGLE_CONTEXT_TRY(mState.syncDirtyObject(this, target));
-
    Framebuffer *framebuffer = mState.getTargetFramebuffer(target);
    ASSERT(framebuffer);

+    // No-op incomplete FBOs.
    if (!framebuffer->isComplete(this))
    {
        return;
    }

+    // Only sync the FBO
+    ANGLE_CONTEXT_TRY(mState.syncDirtyObject(this, target));
    ANGLE_CONTEXT_TRY(framebuffer->invalidate(this, numAttachments, attachments));
 }


--- a/src/tests/gl_tests/FramebufferTest.cpp
+++ b/src/tests/gl_tests/FramebufferTest.cpp
@@ -368,9 +368,6 @@ class FramebufferTest_ES3 : public ANGLETest
 // Covers invalidating an incomplete framebuffer. This should be a no-op, but should not error.
 TEST_P(FramebufferTest_ES3, InvalidateIncomplete)
 {
-    // TODO: anglebug.com/3971
-    ANGLE_SKIP_TEST_IF(IsVulkan());
-
    GLFramebuffer framebuffer;
    GLRenderbuffer renderbuffer;