LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 49947927: am ad31d5ca: Merge "GLES2 Translator: GetVertexAttrib* fix"

Browse Source 
* commit '49947927c35b6e2320bad56330e59cccb0c54bd9':
  GLES2 Translator: GetVertexAttrib* fix
This commit is contained in:
David Turner
2011-07-11 15:57:06 -07:00
committed by Android Git Automerger
parent d538593a21 49947927c3
commit b7b2af8386
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/emulator/opengl/host/libs/Translator/GLES_V2/GLESv2Imp.cpp
View File

@@ -846,7 +846,7 @@ GL_APICALL void GL_APIENTRY glGetVertexAttribfv(GLuint index, GLenum pname, GLf
ctx->setGLerror(GL_INVALID_ENUM); ctx->setGLerror(GL_INVALID_ENUM);
} }
} else { } else {
ctx->setGLerror(GL_INVALID_ENUM); ctx->setGLerror(GL_INVALID_VALUE);
} }
} }
@@ -880,7 +880,7 @@ GL_APICALL void GL_APIENTRY glGetVertexAttribiv(GLuint index, GLenum pname, GLi
ctx->setGLerror(GL_INVALID_ENUM); ctx->setGLerror(GL_INVALID_ENUM);
} }
} else { } else {
ctx->setGLerror(GL_INVALID_ENUM); ctx->setGLerror(GL_INVALID_VALUE);
} }
} }
@@ -893,7 +893,7 @@ GL_APICALL void GL_APIENTRY glGetVertexAttribPointerv(GLuint index, GLenum pnam
if(p) { if(p) {
*pointer = const_cast<void *>( p->getBufferData()); *pointer = const_cast<void *>( p->getBufferData());
} else { } else {
ctx->setGLerror(GL_INVALID_ENUM); ctx->setGLerror(GL_INVALID_VALUE);
} }
} }