am d82e3bed: Merge "emulator opengl: handle NULL pointers"

* commit 'd82e3bedd000a6f57763272e2452e8af2973823b':
  emulator opengl: handle NULL pointers
This commit is contained in:
David Turner
2011-05-03 12:54:56 -07:00
committed by Android Git Automerger

View File

@@ -9,6 +9,7 @@ glBindAttribLocation
#void glBufferData(GLenum target, GLsizeiptr size, GLvoid *data, GLenum usage) #void glBufferData(GLenum target, GLsizeiptr size, GLvoid *data, GLenum usage)
glBufferData glBufferData
len data size len data size
var_flag data nullAllowed
#void glBufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, GLvoid *data) #void glBufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, GLvoid *data)
glBufferSubData glBufferSubData
@@ -220,6 +221,7 @@ glShaderBinary
glTexImage2D glTexImage2D
dir pixels in dir pixels in
len pixels pixelDataSize(self, width, height, format, type, 1) len pixels pixelDataSize(self, width, height, format, type, 1)
var_flag pixels nullAllowed
#void glTexParameterfv(GLenum target, GLenum pname, GLfloat *params) #void glTexParameterfv(GLenum target, GLenum pname, GLfloat *params)
glTexParameterfv glTexParameterfv
@@ -310,6 +312,7 @@ glMapBufferOES
#void glTexImage3DOES(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, GLvoid *pixels) #void glTexImage3DOES(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, GLvoid *pixels)
glTexImage3DOES glTexImage3DOES
len pixels pixelDataSize3D(self, width, height, depth, format, type, 1) len pixels pixelDataSize3D(self, width, height, depth, format, type, 1)
var_flag pixels nullAllowed
#void glTexSubImage3DOES(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, GLvoid *pixels) #void glTexSubImage3DOES(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, GLvoid *pixels)
glTexSubImage3DOES glTexSubImage3DOES