emulator/opengl: Fix pixelDataSize() ambiguity.

Without this fix, the GLESv1 encoder library will link to the
pixelDataSize() function that is defined in the GLESv2 encoder library,
which results in bugs, like the boot animation now showing with -gpu on.

This patch doesn't change the generated decoder libraries, nor does it
affect the encoder ones until external/qemu/distrib/update-emugl-sources.sh
is called. When the latter script will be run, other changes under
device/generic/goldfish/generic/ will be needed to fix the namespace
of the functions being defined in GLEncoderUtils.cpp and GL2EncoderUtils.cpp

Change-Id: I588659461dd6d73350d150a896494ccf50fbdc7f

2 files changed, 11 insertions, 11 deletions

diff --git a/emulator/opengl/host/libs/GLESv1_dec/gl.attrib b/emulator/opengl/host/libs/GLESv1_dec/gl.attrib
index 580575b..26b793e 100644
--- a/emulator/opengl/host/libs/GLESv1_dec/gl.attrib
+++ b/emulator/opengl/host/libs/GLESv1_dec/gl.attrib
@@ -221,7 +221,7 @@ glPointParameterxv
 #void glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels)
 glReadPixels
 	dir pixels out
-	len pixels pixelDataSize(self, width, height, format, type, 1)
+	len pixels glesv1_enc::pixelDataSize(self, width, height, format, type, 1)
 
 #void glTexCoordPointer(GLint size, GLenum type, GLsizei stride, GLvoid *pointer)
 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)
 glTexImage2D
 	dir pixels in
-	len pixels pixelDataSize(self, width, height, format, type, 0)
+	len pixels glesv1_enc::pixelDataSize(self, width, height, format, type, 0)
 	var_flag pixels nullAllowed isLarge
 
 #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)
 glTexSubImage2D
-	len pixels pixelDataSize(self, width, height, format, type, 0)
+	len pixels glesv1_enc::pixelDataSize(self, width, height, format, type, 0)
         var_flag pixels isLarge
 
 #void glVertexPointer(GLint size, GLenum type, GLsizei stride, GLvoid *pointer)
@@ -666,7 +666,7 @@ glExtGetTexLevelParameterivQCOM
 #void glExtGetTexSubImageQCOM(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, GLvoid *texels)
 glExtGetTexSubImageQCOM
 	dir texels out
-	len texels (depth * pixelDataSize(self, width, height, format, type, 0))
+	len texels (depth * glesv1_enc::pixelDataSize(self, width, height, format, type, 0))
 
 #void glExtGetBufferPointervQCOM(GLenum target, GLvoid **params)
 glExtGetBufferPointervQCOM
diff --git a/emulator/opengl/host/libs/GLESv2_dec/gl2.attrib b/emulator/opengl/host/libs/GLESv2_dec/gl2.attrib
index 60bd78c..3a6da47 100644
--- a/emulator/opengl/host/libs/GLESv2_dec/gl2.attrib
+++ b/emulator/opengl/host/libs/GLESv2_dec/gl2.attrib
@@ -206,12 +206,12 @@ glGetTexParameteriv
 #void glGetUniformfv(GLuint program, GLint location, GLfloat *params)
 glGetUniformfv
 	dir params out
-	len params glSizeof(uniformType(self, program, location))
+	len params glSizeof(glesv2_enc::uniformType(self, program, location))
 
 #void glGetUniformiv(GLuint program, GLint location, GLint *params)
 glGetUniformiv
 	dir params out
-	len params glSizeof(uniformType(self, program, location))
+	len params glSizeof(glesv2_enc::uniformType(self, program, location))
 
 #int glGetUniformLocation(GLuint program, GLchar *name)
 glGetUniformLocation
@@ -236,7 +236,7 @@ glGetVertexAttribiv
 #void glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels)
 glReadPixels
 	dir pixels out
-	len pixels pixelDataSize(self, width, height, format, type, 1)
+	len pixels glesv2_enc::pixelDataSize(self, width, height, format, type, 1)
 
 #void glShaderBinary(GLsizei n, GLuint *shaders, GLenum binaryformat, GLvoid *binary, GLsizei length)
 glShaderBinary
@@ -245,7 +245,7 @@ glShaderBinary
 #void glTexImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, GLvoid *pixels)
 glTexImage2D
 	dir pixels in
-	len pixels pixelDataSize(self, width, height, format, type, 0)
+	len pixels glesv2_enc::pixelDataSize(self, width, height, format, type, 0)
 	var_flag pixels nullAllowed isLarge
 
 #void glTexParameterfv(GLenum target, GLenum pname, GLfloat *params)
@@ -257,7 +257,7 @@ glTexParameteriv
 
 #void glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels)
 glTexSubImage2D
-	len pixels pixelDataSize(self, width, height, format, type, 0)
+	len pixels glesv2_enc::pixelDataSize(self, width, height, format, type, 0)
         var_flag pixels nullAllowed isLarge
 	
 #void glUniform1fv(GLint location, GLsizei count, GLfloat *v)
@@ -337,12 +337,12 @@ glMapBufferOES
 
 #void glTexImage3DOES(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, GLvoid *pixels)
 glTexImage3DOES
-	len pixels pixelDataSize3D(self, width, height, depth, format, type, 0)
+	len pixels glesv2_enc::pixelDataSize3D(self, width, height, depth, format, type, 0)
 	var_flag pixels nullAllowed isLarge
 
 #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
-	len pixels pixelDataSize3D(self, width, height, depth, format, type, 0)	
+	len pixels glesv2_enc::pixelDataSize3D(self, width, height, depth, format, type, 0)	
         var_flag pixels isLarge
 
 #void glCompressedTexImage3DOES(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, GLvoid *data)