am 117f574e: Merge change 26911 into eclair

Merge commit '117f574e105c682ebff19ece7230fab86fea3d17' into eclair-plus-aosp

* commit '117f574e105c682ebff19ece7230fab86fea3d17':
  OpenGL ES doesn't allow glColorPointer with a size parameter other than 4
This commit is contained in:
Mathias Agopian
2009-09-24 14:51:00 -07:00
committed by Android Git Automerger

View File

@@ -1266,9 +1266,7 @@ void glColorPointer(
GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
{
ogles_context_t* c = ogles_context_t::get();
// in theory ogles doesn't allow color arrays of size 3
// but it is very useful to 'visualize' the normal array.
if (size<3 || size>4 || stride<0) {
if (size!=4 || stride<0) {
ogles_error(c, GL_INVALID_VALUE);
return;
}