Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 117f574e: Merge change 26911 into eclair

Browse Source 
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
parent 08228fdaff 117f574e10
commit a38ff0c263
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
opengl/libagl/array.cpp
View File

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