Keep default FBO attachments immutable.

In some cases we would let the user change the attachments of the default FBO. This hole in our validation would confound the dEQP negative API tests (negative_api.buffer.framebuffer_*) and muck up the remainder of the test run. BUG=angleproject:901 Change-Id: I2b3c04752d1df3289d41c013cc936eda30e98aad Reviewed-on: https://chromium-review.googlesource.com/266927Reviewed-by: Geoff Lang <geofflang@chromium.org> Reviewed-by: Brandon Jones <bajones@chromium.org> Tested-by: Jamie Madill <jmadill@chromium.org>

Keep default FBO attachments immutable.
84115c92 · Jamie Madill · 0be9a8a0 · 84115c92
Commit 84115c92 authored Apr 23, 2015 by Jamie Madill
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 6 deletions

validationES.cpp src/libANGLE/validationES.cpp +6 -6

No files found.
--- a/src/libANGLE/validationES.cpp
+++ b/src/libANGLE/validationES.cpp
@@ -386,11 +386,11 @@ bool ValidateFramebufferRenderbufferParameters(gl::Context *context, GLenum targ
    }

    gl::Framebuffer *framebuffer = context->getState().getTargetFramebuffer(target);
-    GLuint framebufferHandle = context->getState().getTargetFramebuffer(target)->id();

-    if (!framebuffer || (framebufferHandle == 0 && renderbuffer != 0))
+    ASSERT(framebuffer);
+    if (framebuffer->id() == 0)
    {
-        context->recordError(Error(GL_INVALID_OPERATION));
+        context->recordError(Error(GL_INVALID_OPERATION, "Cannot change default FBO's attachments"));
        return false;
    }

@@ -1735,11 +1735,11 @@ bool ValidateFramebufferTextureBase(Context *context, GLenum target, GLenum atta
    }

    const gl::Framebuffer *framebuffer = context->getState().getTargetFramebuffer(target);
-    GLuint framebufferHandle = context->getState().getTargetFramebuffer(target)->id();
+    ASSERT(framebuffer);

-    if (framebufferHandle == 0 || !framebuffer)
+    if (framebuffer->id() == 0)
    {
-        context->recordError(Error(GL_INVALID_OPERATION));
+        context->recordError(Error(GL_INVALID_OPERATION, "Cannot change default FBO's attachments"));
        return false;
    }