GLESv1 extensions

This fix adds support for OpenGLES 1.1 extensions in the codec
layer. This fix also includes bug fixes in GLEncoder (client-state)
and gles android wrapper modules.

Change-Id: I512649724d43e4af9d3ce5d49ae66d9f4da0b823
This commit is contained in:
Liran
2011-04-07 17:01:47 +03:00
parent 9e9b85c3f6
commit fb06a28c30
15 changed files with 896 additions and 68 deletions

View File

@@ -100,7 +100,7 @@ void glFrustumf(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloa
void glGetClipPlanef(GLenum pname, GLfloat eqn[4])
{
getDispatch()->glGetClipPlanef(pname, eqn[4]);
getDispatch()->glGetClipPlanef(pname, eqn);
}
void glGetFloatv(GLenum pname, GLfloat *params)
@@ -450,7 +450,7 @@ void glGetBufferParameteriv(GLenum target, GLenum pname, GLint *params)
void glGetClipPlanex(GLenum pname, GLfixed eqn[4])
{
getDispatch()->glGetClipPlanex(pname, eqn[4]);
getDispatch()->glGetClipPlanex(pname, eqn);
}
void glGenBuffers(GLsizei n, GLuint *buffers)
@@ -490,7 +490,7 @@ void glGetMaterialxv(GLenum face, GLenum pname, GLfixed *params)
void glGetPointerv(GLenum pname, GLvoid **params)
{
getDispatch()->glGetPointerv(pname, *params);
getDispatch()->glGetPointerv(pname, params);
}
const GLubyte* glGetString(GLenum name)
@@ -890,7 +890,7 @@ void glFrustumxOES(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLf
void glGetClipPlanexOES(GLenum pname, GLfixed eqn[4])
{
getDispatch()->glGetClipPlanexOES(pname, eqn[4]);
getDispatch()->glGetClipPlanexOES(pname, eqn);
}
void glGetFixedvOES(GLenum pname, GLfixed *params)
@@ -1150,7 +1150,7 @@ void glWeightPointerOES(GLint size, GLenum type, GLsizei stride, const GLvoid *p
GLbitfield glQueryMatrixxOES(GLfixed mantissa[16], GLint exponent[16])
{
return getDispatch()->glQueryMatrixxOES(mantissa[16], exponent[16]);
return getDispatch()->glQueryMatrixxOES(mantissa, exponent);
}
void glDepthRangefOES(GLclampf zNear, GLclampf zFar)
@@ -1175,7 +1175,7 @@ void glClipPlanefOES(GLenum plane, const GLfloat *equation)
void glGetClipPlanefOES(GLenum pname, GLfloat eqn[4])
{
getDispatch()->glGetClipPlanefOES(pname, eqn[4]);
getDispatch()->glGetClipPlanefOES(pname, eqn);
}
void glClearDepthfOES(GLclampf depth)
@@ -1375,7 +1375,7 @@ void glExtGetTexSubImageQCOM(GLenum target, GLint level, GLint xoffset, GLint yo
void glExtGetBufferPointervQCOM(GLenum target, GLvoid **params)
{
getDispatch()->glExtGetBufferPointervQCOM(target, *params);
getDispatch()->glExtGetBufferPointervQCOM(target, params);
}
void glExtGetShadersQCOM(GLuint *shaders, GLint maxShaders, GLint *numShaders)

View File

@@ -29,7 +29,7 @@ typedef void (* glDepthRangef_t) (GLclampf, GLclampf);
typedef void (* glFogf_t) (GLenum, GLfloat);
typedef void (* glFogfv_t) (GLenum, const GLfloat*);
typedef void (* glFrustumf_t) (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
typedef void (* glGetClipPlanef_t) (GLenum, GLfloat);
typedef void (* glGetClipPlanef_t) (GLenum, GLfloat*);
typedef void (* glGetFloatv_t) (GLenum, GLfloat*);
typedef void (* glGetLightfv_t) (GLenum, GLenum, GLfloat*);
typedef void (* glGetMaterialfv_t) (GLenum, GLenum, GLfloat*);
@@ -99,7 +99,7 @@ typedef void (* glFrontFace_t) (GLenum);
typedef void (* glFrustumx_t) (GLfixed, GLfixed, GLfixed, GLfixed, GLfixed, GLfixed);
typedef void (* glGetBooleanv_t) (GLenum, GLboolean*);
typedef void (* glGetBufferParameteriv_t) (GLenum, GLenum, GLint*);
typedef void (* glGetClipPlanex_t) (GLenum, GLfixed);
typedef void (* glGetClipPlanex_t) (GLenum, GLfixed*);
typedef void (* glGenBuffers_t) (GLsizei, GLuint*);
typedef void (* glGenTextures_t) (GLsizei, GLuint*);
typedef GLenum (* glGetError_t) ();
@@ -107,7 +107,7 @@ typedef void (* glGetFixedv_t) (GLenum, GLfixed*);
typedef void (* glGetIntegerv_t) (GLenum, GLint*);
typedef void (* glGetLightxv_t) (GLenum, GLenum, GLfixed*);
typedef void (* glGetMaterialxv_t) (GLenum, GLenum, GLfixed*);
typedef void (* glGetPointerv_t) (GLenum, GLvoid*);
typedef void (* glGetPointerv_t) (GLenum, GLvoid**);
typedef const GLubyte* (* glGetString_t) (GLenum);
typedef void (* glGetTexEnviv_t) (GLenum, GLenum, GLint*);
typedef void (* glGetTexEnvxv_t) (GLenum, GLenum, GLfixed*);
@@ -187,7 +187,7 @@ typedef void (* glDepthRangexOES_t) (GLclampx, GLclampx);
typedef void (* glFogxOES_t) (GLenum, GLfixed);
typedef void (* glFogxvOES_t) (GLenum, const GLfixed*);
typedef void (* glFrustumxOES_t) (GLfixed, GLfixed, GLfixed, GLfixed, GLfixed, GLfixed);
typedef void (* glGetClipPlanexOES_t) (GLenum, GLfixed);
typedef void (* glGetClipPlanexOES_t) (GLenum, GLfixed*);
typedef void (* glGetFixedvOES_t) (GLenum, GLfixed*);
typedef void (* glGetLightxvOES_t) (GLenum, GLenum, GLfixed*);
typedef void (* glGetMaterialxvOES_t) (GLenum, GLenum, GLfixed*);
@@ -239,12 +239,12 @@ typedef void (* glCurrentPaletteMatrixOES_t) (GLuint);
typedef void (* glLoadPaletteFromModelViewMatrixOES_t) ();
typedef void (* glMatrixIndexPointerOES_t) (GLint, GLenum, GLsizei, const GLvoid*);
typedef void (* glWeightPointerOES_t) (GLint, GLenum, GLsizei, const GLvoid*);
typedef GLbitfield (* glQueryMatrixxOES_t) (GLfixed, GLint);
typedef GLbitfield (* glQueryMatrixxOES_t) (GLfixed*, GLint*);
typedef void (* glDepthRangefOES_t) (GLclampf, GLclampf);
typedef void (* glFrustumfOES_t) (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
typedef void (* glOrthofOES_t) (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
typedef void (* glClipPlanefOES_t) (GLenum, const GLfloat*);
typedef void (* glGetClipPlanefOES_t) (GLenum, GLfloat);
typedef void (* glGetClipPlanefOES_t) (GLenum, GLfloat*);
typedef void (* glClearDepthfOES_t) (GLclampf);
typedef void (* glTexGenfOES_t) (GLenum, GLenum, GLfloat);
typedef void (* glTexGenfvOES_t) (GLenum, GLenum, const GLfloat*);
@@ -284,7 +284,7 @@ typedef void (* glExtGetFramebuffersQCOM_t) (GLuint*, GLint, GLint*);
typedef void (* glExtGetTexLevelParameterivQCOM_t) (GLuint, GLenum, GLint, GLenum, GLint*);
typedef void (* glExtTexObjectStateOverrideiQCOM_t) (GLenum, GLenum, GLint);
typedef void (* glExtGetTexSubImageQCOM_t) (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, GLvoid*);
typedef void (* glExtGetBufferPointervQCOM_t) (GLenum, GLvoid*);
typedef void (* glExtGetBufferPointervQCOM_t) (GLenum, GLvoid**);
typedef void (* glExtGetShadersQCOM_t) (GLuint*, GLint, GLint*);
typedef void (* glExtGetProgramsQCOM_t) (GLuint*, GLint, GLint*);
typedef GLboolean (* glExtIsProgramBinaryQCOM_t) (GLuint);

View File

@@ -1,6 +1,7 @@
LOCAL_PATH := $(call my-dir)
emulatorOpengl := $(LOCAL_PATH)/../..
EMUGEN := $(BUILD_OUT_EXECUTABLES)/emugen
#### ut_rendercontrol ####
include $(CLEAR_VARS)