Removes sub-entry-point Framebuffer validations

src/libGLESv2/Context.cpp

@@ -1515,25 +1515,19 @@ Texture *Context::getTargetTexture(GLenum target) const
 
 GLuint Context::getTargetFramebufferHandle(GLenum target) const
 {
-    if (!ValidFramebufferTarget(target))
-    {
-        return GL_INVALID_INDEX;
-    }
-
-    if (target == GL_READ_FRAMEBUFFER_ANGLE)
-    {
-        return mState.readFramebuffer->id();
-    }
-    else
+    switch (target)
     {
-        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

src/libGLESv2/libGLESv2.cpp

@@ -2603,7 +2603,6 @@ void __stdcall glGetFramebufferAttachmentParameteriv(GLenum target, GLenum attac
             }
 
             GLuint framebufferHandle = context->getTargetFramebufferHandle(target);
-            ASSERT(framebufferHandle != GL_INVALID_INDEX);
             gl::Framebuffer *framebuffer = context->getFramebuffer(framebufferHandle);
 
             if (framebufferHandle == 0)

src/libGLESv2/validationES.cpp

@@ -360,6 +360,11 @@ bool ValidateRenderbufferStorageParameters(const gl::Context *context, GLenum ta
 bool ValidateFramebufferRenderbufferParameters(gl::Context *context, GLenum target, GLenum attachment,
                                                GLenum renderbuffertarget, GLuint renderbuffer)
 {
+    if (!ValidFramebufferTarget(target))
+    {
+        return gl::error(GL_INVALID_ENUM, false);
+    }
+
     gl::Framebuffer *framebuffer = context->getTargetFramebuffer(target);
     GLuint framebufferHandle = context->getTargetFramebufferHandle(target);