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

am 2ad48e99: am 54502698: Merge "opengles emulator: fix the mixing between pack/unpack alignments"

Browse Source 
* commit '2ad48e99d267e1d03e27e8f49c95b753e2bcf41a':
  opengles emulator: fix the mixing between pack/unpack alignments
This commit is contained in:
David Turner
2011-08-09 10:06:03 -07:00
committed by Android Git Automerger
parent 4b3baea530 2ad48e99d2
commit 87cbeada5c
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/emulator/opengl/system/GLESv1_enc/gl.attrib
View File

@@ -221,7 +221,7 @@ glPointParameterxv
#void glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels) #void glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels)
glReadPixels glReadPixels
dir pixels out dir pixels out
len pixels pixelDataSize(self, width, height, format, type, 0) len pixels pixelDataSize(self, width, height, format, type, 1)
#void glTexCoordPointer(GLint size, GLenum type, GLsizei stride, GLvoid *pointer) #void glTexCoordPointer(GLint size, GLenum type, GLsizei stride, GLvoid *pointer)
glTexCoordPointer glTexCoordPointer
@@ -239,7 +239,7 @@ glTexEnvxv
#void glTexImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, GLvoid *pixels) #void glTexImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, GLvoid *pixels)
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, 0)
var_flag pixels nullAllowed var_flag pixels nullAllowed
#void glTexParameteriv(GLenum target, GLenum pname, GLint *params) #void glTexParameteriv(GLenum target, GLenum pname, GLint *params)
@@ -252,7 +252,7 @@ glTexParameterxv
#void glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels) #void glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels)
glTexSubImage2D glTexSubImage2D
len pixels pixelDataSize(self, width, height, format, type, 1) len pixels pixelDataSize(self, width, height, format, type, 0)
#void glVertexPointer(GLint size, GLenum type, GLsizei stride, GLvoid *pointer) #void glVertexPointer(GLint size, GLenum type, GLsizei stride, GLvoid *pointer)
# we treat the pointer as an offset to a VBO # we treat the pointer as an offset to a VBO

10
tools/emulator/opengl/system/GLESv2_enc/gl2.attrib
View File

@@ -221,7 +221,7 @@ glGetVertexAttribiv
#void glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels) #void glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels)
glReadPixels glReadPixels
dir pixels out dir pixels out
len pixels pixelDataSize(self, width, height, format, type, 0) len pixels pixelDataSize(self, width, height, format, type, 1)
#void glShaderBinary(GLsizei n, GLuint *shaders, GLenum binaryformat, GLvoid *binary, GLsizei length) #void glShaderBinary(GLsizei n, GLuint *shaders, GLenum binaryformat, GLvoid *binary, GLsizei length)
glShaderBinary glShaderBinary
@@ -230,7 +230,7 @@ glShaderBinary
#void glTexImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, GLvoid *pixels) #void glTexImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, GLvoid *pixels)
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, 0)
var_flag pixels nullAllowed var_flag pixels nullAllowed
#void glTexParameterfv(GLenum target, GLenum pname, GLfloat *params) #void glTexParameterfv(GLenum target, GLenum pname, GLfloat *params)
@@ -242,7 +242,7 @@ glTexParameteriv
#void glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels) #void glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels)
glTexSubImage2D glTexSubImage2D
len pixels pixelDataSize(self, width, height, format, type, 1) len pixels pixelDataSize(self, width, height, format, type, 0)
#void glUniform1fv(GLint location, GLsizei count, GLfloat *v) #void glUniform1fv(GLint location, GLsizei count, GLfloat *v)
glUniform1fv glUniform1fv
@@ -321,12 +321,12 @@ 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, 0)
var_flag pixels nullAllowed 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
len pixels pixelDataSize3D(self, width, height, depth, format, type, 1) len pixels pixelDataSize3D(self, width, height, depth, format, type, 0)
#void glCompressedTexImage3DOES(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, GLvoid *data) #void glCompressedTexImage3DOES(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, GLvoid *data)
glCompressedTexImage3DOES glCompressedTexImage3DOES