Removes sub-entry-point Framebuffer validations
BUG=angle:685
Change-Id: I2d630396a5971972f858cca9c39ceb6509492aa4
Reviewed-on: https://chromium-review.googlesource.com/205836
Tested-by: Shannon Woods <shannonwoods@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
diff --git a/src/libGLESv2/Context.cpp b/src/libGLESv2/Context.cpp
index e410f18..d57f8bc 100644
--- a/src/libGLESv2/Context.cpp
+++ b/src/libGLESv2/Context.cpp
@@ -1515,25 +1515,19 @@
GLuint Context::getTargetFramebufferHandle(GLenum target) const
{
- if (!ValidFramebufferTarget(target))
+ switch (target)
{
- return GL_INVALID_INDEX;
- }
-
- if (target == GL_READ_FRAMEBUFFER_ANGLE)
- {
- return mState.readFramebuffer->id();
- }
- else
- {
- return mState.drawFramebuffer->id();
+ case GL_READ_FRAMEBUFFER_ANGLE: return mState.readFramebuffer->id();
+ case GL_DRAW_FRAMEBUFFER_ANGLE:
+ case GL_FRAMEBUFFER: return mState.drawFramebuffer->id();
+ default: UNREACHABLE(); return 0;
}
}
Framebuffer *Context::getTargetFramebuffer(GLenum target) const
{
GLuint framebufferHandle = getTargetFramebufferHandle(target);
- return (framebufferHandle == GL_INVALID_INDEX ? NULL : getFramebuffer(framebufferHandle));
+ return getFramebuffer(framebufferHandle);
}
Texture2D *Context::getTexture2D() const