Fixed Framebuffer attachment checks
Some checks in Framebuffer related functions were still
ES2 only. Made some modification to fix the checks for ES3.
Change-Id: Iaef6133179ea830dd599a5d66bc9698032085569
Reviewed-on: https://swiftshader-review.googlesource.com/3690
Tested-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
diff --git a/src/OpenGL/libGLESv2/libGLESv2.cpp b/src/OpenGL/libGLESv2/libGLESv2.cpp
index 61323a2..bf7b938 100644
--- a/src/OpenGL/libGLESv2/libGLESv2.cpp
+++ b/src/OpenGL/libGLESv2/libGLESv2.cpp
@@ -2250,16 +2250,6 @@
return error(GL_INVALID_ENUM);
}
- switch(attachment)
- {
- case GL_COLOR_ATTACHMENT0:
- case GL_DEPTH_ATTACHMENT:
- case GL_STENCIL_ATTACHMENT:
- break;
- default:
- return error(GL_INVALID_ENUM);
- }
-
es2::Context *context = es2::getContext();
if(context)
@@ -2367,6 +2357,8 @@
break;
case GL_DEPTH_ATTACHMENT: framebuffer->setDepthbuffer(textarget, texture, level); break;
case GL_STENCIL_ATTACHMENT: framebuffer->setStencilbuffer(textarget, texture, level); break;
+ default:
+ return error(GL_INVALID_ENUM);
}
}
}
@@ -7311,16 +7303,6 @@
return error(GL_INVALID_ENUM);
}
- switch(attachment)
- {
- case GL_COLOR_ATTACHMENT0:
- case GL_DEPTH_ATTACHMENT:
- case GL_STENCIL_ATTACHMENT:
- break;
- default:
- return error(GL_INVALID_ENUM);
- }
-
es2::Context *context = es2::getContext();
if(context)
@@ -7412,6 +7394,8 @@
break;
case GL_DEPTH_ATTACHMENT: framebuffer->setDepthbuffer(textarget, texture); break;
case GL_STENCIL_ATTACHMENT: framebuffer->setStencilbuffer(textarget, texture); break;
+ default:
+ return error(GL_INVALID_ENUM);
}
}
}
