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

am e3ca49a9: am 3b987d0c: am a2c959d5: Merge "fixes for gles2 tests"

Browse Source 
* commit 'e3ca49a9495e5cd36b5cd3bcd163e11758a4e4cf':
  fixes for gles2 tests
This commit is contained in:
David Turner
2011-06-07 13:24:54 -07:00
committed by Android Git Automerger
parent 8c5259cd48 e3ca49a949
commit 3d03d4854b
4 changed files with 47 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -116,7 +116,7 @@ GL_APICALL void GL_APIENTRY glActiveTexture(GLenum texture){
GL_APICALL void GL_APIENTRY glAttachShader(GLuint program, GLuint shader){
GET_CTX();
if(thrd->shareGroup.Ptr()) {
const GLuint globalProgramName = thrd->shareGroup->getGlobalName(PROGRAM,program);
const GLuint globalProgramName = thrd->shareGroup->getGlobalName(SHADER,program);
const GLuint globalShaderName = thrd->shareGroup->getGlobalName(SHADER,shader);
ctx->dispatcher().glAttachShader(globalProgramName,globalShaderName);
}
@@ -125,7 +125,7 @@ GL_APICALL void GL_APIENTRY glAttachShader(GLuint program, GLuint shader){
GL_APICALL void GL_APIENTRY glBindAttribLocation(GLuint program, GLuint index, const GLchar* name){
GET_CTX();
if(thrd->shareGroup.Ptr()) {
const GLuint globalProgramName = thrd->shareGroup->getGlobalName(PROGRAM,program);
const GLuint globalProgramName = thrd->shareGroup->getGlobalName(SHADER,program);
ctx->dispatcher().glBindAttribLocation(globalProgramName,index,name);
}
}
@@ -302,8 +302,8 @@ GL_APICALL GLuint GL_APIENTRY glCreateProgram(void){
GET_CTX_RET(0);
const GLuint globalProgramName = ctx->dispatcher().glCreateProgram();
if(thrd->shareGroup.Ptr() && globalProgramName) {
const GLuint localProgramName = thrd->shareGroup->genName(PROGRAM);
thrd->shareGroup->replaceGlobalName(PROGRAM,localProgramName,globalProgramName);
const GLuint localProgramName = thrd->shareGroup->genName(SHADER);
thrd->shareGroup->replaceGlobalName(SHADER,localProgramName,globalProgramName);
return localProgramName;
}
if(globalProgramName){
@@ -380,8 +380,8 @@ GL_APICALL void GL_APIENTRY glDeleteTextures(GLsizei n, const GLuint* textures)
GL_APICALL void GL_APIENTRY glDeleteProgram(GLuint program){
GET_CTX();
if(thrd->shareGroup.Ptr()) {
const GLuint globalProgramName = thrd->shareGroup->getGlobalName(PROGRAM,program);
ctx->dispatcher().glDeleteProgram(program);
const GLuint globalProgramName = thrd->shareGroup->getGlobalName(SHADER,program);
ctx->dispatcher().glDeleteProgram(globalProgramName);
}
}
@@ -389,7 +389,7 @@ GL_APICALL void GL_APIENTRY glDeleteShader(GLuint shader){
GET_CTX();
if(thrd->shareGroup.Ptr()) {
const GLuint globalShaderName = thrd->shareGroup->getGlobalName(SHADER,shader);
ctx->dispatcher().glDeleteShader(shader);
ctx->dispatcher().glDeleteShader(globalShaderName);
}
}
@@ -409,7 +409,7 @@ GL_APICALL void GL_APIENTRY glDepthRangef(GLclampf zNear, GLclampf zFar){
GL_APICALL void GL_APIENTRY glDetachShader(GLuint program, GLuint shader){
GET_CTX();
if(thrd->shareGroup.Ptr()) {
const GLuint globalProgramName = thrd->shareGroup->getGlobalName(PROGRAM,program);
const GLuint globalProgramName = thrd->shareGroup->getGlobalName(SHADER,program);
const GLuint globalShaderName = thrd->shareGroup->getGlobalName(SHADER,shader);
ctx->dispatcher().glDetachShader(globalProgramName,globalShaderName);
}
@@ -502,7 +502,7 @@ GL_APICALL void GL_APIENTRY glFramebufferTexture2D(GLenum target, GLenum attach
if(thrd->shareGroup.Ptr()) {
GLuint globalTextureName = thrd->shareGroup->getGlobalName(TEXTURE,texture);
ctx->dispatcher().glFramebufferTexture2D(target,attachment,textarget,texture,level);
ctx->dispatcher().glFramebufferTexture2D(target,attachment,textarget,globalTextureName,level);
}
}
@@ -563,7 +563,7 @@ GL_APICALL void GL_APIENTRY glGenTextures(GLsizei n, GLuint* textures){
GL_APICALL void GL_APIENTRY glGetActiveAttrib(GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, GLchar* name){
GET_CTX();
if(thrd->shareGroup.Ptr()) {
const GLuint globalProgramName = thrd->shareGroup->getGlobalName(PROGRAM,program);
const GLuint globalProgramName = thrd->shareGroup->getGlobalName(SHADER,program);
ctx->dispatcher().glGetActiveAttrib(globalProgramName,index,bufsize,length,size,type,name);
}
}
@@ -571,7 +571,7 @@ GL_APICALL void GL_APIENTRY glGetActiveAttrib(GLuint program, GLuint index, GLs
GL_APICALL void GL_APIENTRY glGetActiveUniform(GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, GLchar* name){
GET_CTX();
if(thrd->shareGroup.Ptr()) {
const GLuint globalProgramName = thrd->shareGroup->getGlobalName(PROGRAM,program);
const GLuint globalProgramName = thrd->shareGroup->getGlobalName(SHADER,program);
ctx->dispatcher().glGetActiveUniform(globalProgramName,index,bufsize,length,size,type,name);
}
}
@@ -579,7 +579,7 @@ GL_APICALL void GL_APIENTRY glGetActiveUniform(GLuint program, GLuint index, GL
GL_APICALL void GL_APIENTRY glGetAttachedShaders(GLuint program, GLsizei maxcount, GLsizei* count, GLuint* shaders){
GET_CTX();
if(thrd->shareGroup.Ptr()) {
const GLuint globalProgramName = thrd->shareGroup->getGlobalName(PROGRAM,program);
const GLuint globalProgramName = thrd->shareGroup->getGlobalName(SHADER,program);
ctx->dispatcher().glGetAttachedShaders(globalProgramName,maxcount,count,shaders);
for(int i=0 ; i < *count ;i++){
shaders[i] = thrd->shareGroup->getLocalName(SHADER,shaders[i]);
@@ -590,7 +590,7 @@ GL_APICALL void GL_APIENTRY glGetAttachedShaders(GLuint program, GLsizei maxcou
GL_APICALL int GL_APIENTRY glGetAttribLocation(GLuint program, const GLchar* name){
GET_CTX_RET(-1);
if(thrd->shareGroup.Ptr()) {
const GLuint globalProgramName = thrd->shareGroup->getGlobalName(PROGRAM,program);
const GLuint globalProgramName = thrd->shareGroup->getGlobalName(SHADER,program);
return ctx->dispatcher().glGetAttribLocation(globalProgramName,name);
}
return -1;
@@ -655,7 +655,7 @@ GL_APICALL void GL_APIENTRY glGetRenderbufferParameteriv(GLenum target, GLenum
GL_APICALL void GL_APIENTRY glGetProgramiv(GLuint program, GLenum pname, GLint* params){
GET_CTX();
if(thrd->shareGroup.Ptr()) {
const GLuint globalProgramName = thrd->shareGroup->getGlobalName(PROGRAM,program);
const GLuint globalProgramName = thrd->shareGroup->getGlobalName(SHADER,program);
ctx->dispatcher().glGetProgramiv(globalProgramName,pname,params);
}
}
@@ -663,7 +663,7 @@ GL_APICALL void GL_APIENTRY glGetProgramiv(GLuint program, GLenum pname, GLint*
GL_APICALL void GL_APIENTRY glGetProgramInfoLog(GLuint program, GLsizei bufsize, GLsizei* length, GLchar* infolog){
GET_CTX();
if(thrd->shareGroup.Ptr()) {
const GLuint globalProgramName = thrd->shareGroup->getGlobalName(PROGRAM,program);
const GLuint globalProgramName = thrd->shareGroup->getGlobalName(SHADER,program);
ctx->dispatcher().glGetProgramInfoLog(globalProgramName,bufsize,length,infolog);
}
}
@@ -738,7 +738,7 @@ GL_APICALL void GL_APIENTRY glGetTexParameteriv(GLenum target, GLenum pname, GL
GL_APICALL void GL_APIENTRY glGetUniformfv(GLuint program, GLint location, GLfloat* params){
GET_CTX();
if(thrd->shareGroup.Ptr()) {
const GLuint globalProgramName = thrd->shareGroup->getGlobalName(PROGRAM,program);
const GLuint globalProgramName = thrd->shareGroup->getGlobalName(SHADER,program);
ctx->dispatcher().glGetUniformfv(globalProgramName,location,params);
}
}
@@ -746,7 +746,7 @@ GL_APICALL void GL_APIENTRY glGetUniformfv(GLuint program, GLint location, GLfl
GL_APICALL void GL_APIENTRY glGetUniformiv(GLuint program, GLint location, GLint* params){
GET_CTX();
if(thrd->shareGroup.Ptr()) {
const GLuint globalProgramName = thrd->shareGroup->getGlobalName(PROGRAM,program);
const GLuint globalProgramName = thrd->shareGroup->getGlobalName(SHADER,program);
ctx->dispatcher().glGetUniformiv(globalProgramName,location,params);
}
}
@@ -754,7 +754,7 @@ GL_APICALL void GL_APIENTRY glGetUniformiv(GLuint program, GLint location, GLin
GL_APICALL int GL_APIENTRY glGetUniformLocation(GLuint program, const GLchar* name){
GET_CTX_RET(-1);
if(thrd->shareGroup.Ptr()) {
const GLuint globalProgramName = thrd->shareGroup->getGlobalName(PROGRAM,program);
const GLuint globalProgramName = thrd->shareGroup->getGlobalName(SHADER,program);
return ctx->dispatcher().glGetUniformLocation(globalProgramName,name);
}
return -1;
@@ -889,16 +889,20 @@ GL_APICALL GLboolean GL_APIENTRY glIsTexture(GLuint texture){
GL_APICALL GLboolean GL_APIENTRY glIsProgram(GLuint program){
GET_CTX_RET(GL_FALSE)
if(program && thrd->shareGroup.Ptr()){
return thrd->shareGroup->isObject(PROGRAM,program) ? GL_TRUE :GL_FALSE;
if(program && thrd->shareGroup.Ptr() &&
thrd->shareGroup->isObject(SHADER,program)) {
const GLuint globalProgramName = thrd->shareGroup->getGlobalName(SHADER,program);
return ctx->dispatcher().glIsProgram(globalProgramName);
}
return GL_FALSE;
}
GL_APICALL GLboolean GL_APIENTRY glIsShader(GLuint shader){
GET_CTX_RET(GL_FALSE)
if(shader && thrd->shareGroup.Ptr()){
return thrd->shareGroup->isObject(SHADER,shader) ? GL_TRUE :GL_FALSE;
if(shader && thrd->shareGroup.Ptr() &&
thrd->shareGroup->isObject(SHADER,shader)) {
const GLuint globalShaderName = thrd->shareGroup->getGlobalName(SHADER,shader);
return ctx->dispatcher().glIsShader(globalShaderName);
}
return GL_FALSE;
}
@@ -911,7 +915,7 @@ GL_APICALL void GL_APIENTRY glLineWidth(GLfloat width){
GL_APICALL void GL_APIENTRY glLinkProgram(GLuint program){
GET_CTX();
if(thrd->shareGroup.Ptr()) {
const GLuint globalProgramName = thrd->shareGroup->getGlobalName(PROGRAM,program);
const GLuint globalProgramName = thrd->shareGroup->getGlobalName(SHADER,program);
ctx->dispatcher().glLinkProgram(globalProgramName);
}
}
@@ -960,7 +964,7 @@ GL_APICALL void GL_APIENTRY glShaderBinary(GLsizei n, const GLuint* shaders, GL
if(thrd->shareGroup.Ptr()){
for(int i=0; i < n ; i++){
const GLuint globalShaderName = thrd->shareGroup->getGlobalName(SHADER,shaders[i]);
ctx->dispatcher().glShaderBinary(1,&shaders[i],binaryformat,binary,length);
ctx->dispatcher().glShaderBinary(1,&globalShaderName,binaryformat,binary,length);
}
}
}
@@ -970,7 +974,7 @@ GL_APICALL void GL_APIENTRY glShaderSource(GLuint shader, GLsizei count, const
GET_CTX();
if(thrd->shareGroup.Ptr()){
const GLuint globalShaderName = thrd->shareGroup->getGlobalName(SHADER,shader);
ctx->dispatcher().glShaderSource(shader,count,string,length);
ctx->dispatcher().glShaderSource(globalShaderName,count,string,length);
}
}
@@ -1168,7 +1172,7 @@ GL_APICALL void GL_APIENTRY glUniformMatrix4fv(GLint location, GLsizei count, G
GL_APICALL void GL_APIENTRY glUseProgram(GLuint program){
GET_CTX();
if(thrd->shareGroup.Ptr()) {
const GLuint globalProgramName = thrd->shareGroup->getGlobalName(PROGRAM,program);
const GLuint globalProgramName = thrd->shareGroup->getGlobalName(SHADER,program);
ctx->dispatcher().glUseProgram(globalProgramName);
}
}
@@ -1176,7 +1180,7 @@ GL_APICALL void GL_APIENTRY glUseProgram(GLuint program){
GL_APICALL void GL_APIENTRY glValidateProgram(GLuint program){
GET_CTX();
if(thrd->shareGroup.Ptr()) {
const GLuint globalProgramName = thrd->shareGroup->getGlobalName(PROGRAM,program);
const GLuint globalProgramName = thrd->shareGroup->getGlobalName(SHADER,program);
ctx->dispatcher().glValidateProgram(globalProgramName);
}
}

19
tools/emulator/opengl/host/libs/Translator/GLcommon/GLDispatch.cpp
View File

@@ -87,6 +87,7 @@ void (GLAPIENTRY *GLDispatch::glDeleteBuffers)(GLsizei,const GLuint *) = NULL;
void (GLAPIENTRY *GLDispatch::glDeleteTextures)(GLsizei,const GLuint *) = NULL;
void (GLAPIENTRY *GLDispatch::glDepthFunc)(GLenum) = NULL;
void (GLAPIENTRY *GLDispatch::glDepthMask)(GLboolean) = NULL;
void (GLAPIENTRY *GLDispatch::glDepthRange)(GLclampd,GLclampd) = NULL;
void (GLAPIENTRY *GLDispatch::glDisable)(GLenum) = NULL;
void (GLAPIENTRY *GLDispatch::glDrawArrays)(GLenum,GLint,GLsizei) = NULL;
void (GLAPIENTRY *GLDispatch::glDrawElements)(GLenum,GLsizei,GLenum,const GLvoid *) = NULL;
@@ -118,6 +119,8 @@ void (GLAPIENTRY *GLDispatch::glStencilFunc)(GLenum,GLint,GLuint) = NULL;
void (GLAPIENTRY *GLDispatch::glStencilMask)(GLuint) = NULL;
void (GLAPIENTRY *GLDispatch::glStencilOp)(GLenum, GLenum,GLenum);
void (GLAPIENTRY *GLDispatch::glTexImage2D)(GLenum,GLint,GLint,GLsizei,GLsizei,GLint,GLenum,GLenum,const GLvoid *) = NULL;
void (GLAPIENTRY *GLDispatch::glTexParameterf)(GLenum,GLenum, GLfloat) = NULL;
void (GLAPIENTRY *GLDispatch::glTexParameterfv)(GLenum,GLenum,const GLfloat *) = NULL;
void (GLAPIENTRY *GLDispatch::glTexParameteri)(GLenum,GLenum,GLint) = NULL;
void (GLAPIENTRY *GLDispatch::glTexParameteriv)(GLenum,GLenum,const GLint *) = NULL;
void (GLAPIENTRY *GLDispatch::glTexSubImage2D)(GLenum,GLint,GLint,GLint,GLsizei,GLsizei,GLenum,GLenum,const GLvoid *) = NULL;
@@ -139,7 +142,6 @@ void (GLAPIENTRY *GLDispatch::glColor4fv)(const GLfloat *) = NULL;
void (GLAPIENTRY *GLDispatch::glColor4ub)(GLubyte,GLubyte,GLubyte,GLubyte) = NULL;
void (GLAPIENTRY *GLDispatch::glColor4ubv)(const GLubyte *) = NULL;
void (GLAPIENTRY *GLDispatch::glColorPointer)(GLint,GLenum,GLsizei,const GLvoid *) = NULL;
void (GLAPIENTRY *GLDispatch::glDepthRange)(GLclampd,GLclampd) = NULL;
void (GLAPIENTRY *GLDispatch::glDisableClientState)(GLenum) = NULL;
void (GLAPIENTRY *GLDispatch::glEnableClientState)(GLenum) = NULL;
void (GLAPIENTRY *GLDispatch::glEnd)() = NULL;
@@ -181,8 +183,6 @@ void (GLAPIENTRY *GLDispatch::glRotatef)(GLfloat,GLfloat,GLfloat,GLfloat) = NULL
void (GLAPIENTRY *GLDispatch::glScalef)(GLfloat,GLfloat,GLfloat) = NULL;
void (GLAPIENTRY *GLDispatch::glTexEnvf)(GLenum,GLenum,GLfloat) = NULL;
void (GLAPIENTRY *GLDispatch::glTexEnvfv)(GLenum,GLenum,const GLfloat *) = NULL;
void (GLAPIENTRY *GLDispatch::glTexParameterf)(GLenum,GLenum, GLfloat) = NULL;
void (GLAPIENTRY *GLDispatch::glTexParameterfv)(GLenum,GLenum,const GLfloat *) = NULL;
void (GLAPIENTRY *GLDispatch::glMatrixMode)(GLenum) = NULL;
void (GLAPIENTRY *GLDispatch::glNormalPointer)(GLenum,GLsizei,const GLvoid *) = NULL;
void (GLAPIENTRY *GLDispatch::glPopMatrix)() = NULL;
@@ -232,6 +232,8 @@ void (GL_APIENTRY *GLDispatch::glBindFramebuffer)(GLenum,GLuint) = NULL;
void (GL_APIENTRY *GLDispatch::glBindRenderbuffer)(GLenum,GLuint) = NULL;
void (GL_APIENTRY *GLDispatch::glDeleteFramebuffers)(GLsizei,const GLuint*) = NULL;
void (GL_APIENTRY *GLDispatch::glDeleteRenderbuffers)(GLsizei,const GLuint*) = NULL;
GLboolean (GL_APIENTRY *GLDispatch::glIsProgram)(GLuint program) = NULL;
GLboolean (GL_APIENTRY *GLDispatch::glIsShader)(GLuint shader) = NULL;
void (GL_APIENTRY *GLDispatch::glVertexAttrib1f)(GLuint,GLfloat) = NULL;
void (GL_APIENTRY *GLDispatch::glVertexAttrib1fv)(GLuint,const GLfloat*) = NULL;
void (GL_APIENTRY *GLDispatch::glVertexAttrib2f)(GLuint,GLfloat, GLfloat) = NULL;
@@ -321,6 +323,7 @@ void GLDispatch::dispatchFuncs(GLESVersion version){
LOAD_GL_FUNC(glBufferSubData);
LOAD_GL_FUNC(glClear);
LOAD_GL_FUNC(glClearColor);
LOAD_GL_FUNC(glClearDepth);
LOAD_GL_FUNC(glClearStencil);
LOAD_GL_FUNC(glColorMask);
LOAD_GL_FUNC(glCompressedTexImage2D);
@@ -332,6 +335,7 @@ void GLDispatch::dispatchFuncs(GLESVersion version){
LOAD_GL_FUNC(glDeleteTextures);
LOAD_GL_FUNC(glDepthFunc);
LOAD_GL_FUNC(glDepthMask);
LOAD_GL_FUNC(glDepthRange);
LOAD_GL_FUNC(glDisable);
LOAD_GL_FUNC(glDrawArrays);
LOAD_GL_FUNC(glDrawElements);
@@ -347,6 +351,8 @@ void GLDispatch::dispatchFuncs(GLESVersion version){
LOAD_GL_FUNC(glGetFloatv);
LOAD_GL_FUNC(glGetIntegerv);
LOAD_GL_FUNC(glGetString);
LOAD_GL_FUNC(glTexParameterf);
LOAD_GL_FUNC(glTexParameterfv);
LOAD_GL_FUNC(glGetTexParameterfv);
LOAD_GL_FUNC(glGetTexParameteriv);
LOAD_GL_FUNC(glHint);
@@ -376,7 +382,6 @@ void GLDispatch::dispatchFuncs(GLESVersion version){
if(version == GLES_1_1){
LOAD_GL_FUNC(glAlphaFunc);
LOAD_GL_FUNC(glBegin);
LOAD_GL_FUNC(glClearDepth);
LOAD_GL_FUNC(glClientActiveTexture);
LOAD_GL_FUNC(glClipPlane);
LOAD_GL_FUNC(glColor4d);
@@ -385,7 +390,6 @@ void GLDispatch::dispatchFuncs(GLESVersion version){
LOAD_GL_FUNC(glColor4ub);
LOAD_GL_FUNC(glColor4ubv);
LOAD_GL_FUNC(glColorPointer);
LOAD_GL_FUNC(glDepthRange);
LOAD_GL_FUNC(glDisableClientState);
LOAD_GL_FUNC(glEnableClientState);
LOAD_GL_FUNC(glEnd);
@@ -427,8 +431,6 @@ void GLDispatch::dispatchFuncs(GLESVersion version){
LOAD_GL_FUNC(glScalef);
LOAD_GL_FUNC(glTexEnvf);
LOAD_GL_FUNC(glTexEnvfv);
LOAD_GL_FUNC(glTexParameterf);
LOAD_GL_FUNC(glTexParameterfv);
LOAD_GL_FUNC(glMatrixMode);
LOAD_GL_FUNC(glNormalPointer);
LOAD_GL_FUNC(glPopMatrix);
@@ -480,6 +482,8 @@ void GLDispatch::dispatchFuncs(GLESVersion version){
LOAD_GL_FUNC(glBindRenderbuffer);
LOAD_GL_FUNC(glDeleteFramebuffers);
LOAD_GL_FUNC(glDeleteRenderbuffers);
LOAD_GL_FUNC(glIsProgram);
LOAD_GL_FUNC(glIsShader);
LOAD_GL_FUNC(glVertexAttrib1f);
LOAD_GL_FUNC(glVertexAttrib1fv);
LOAD_GL_FUNC(glVertexAttrib2f);
@@ -546,6 +550,7 @@ void GLDispatch::dispatchFuncs(GLESVersion version){
LOAD_GL_FUNC(glRenderbufferStorage);
LOAD_GL_FUNC(glShaderBinary);
LOAD_GL_FUNC(glShaderSource);
LOAD_GL_FUNC(glStencilMaskSeparate);
LOAD_GL_FUNC(glFramebufferRenderbuffer);
LOAD_GL_FUNC(glFramebufferTexture2D);
}

6
tools/emulator/opengl/host/libs/Translator/include/GLcommon/GLDispatch.h
View File

@@ -55,6 +55,7 @@ public:
static void (GLAPIENTRY *glDeleteTextures) (GLsizei n, const GLuint *textures);
static void (GLAPIENTRY *glDepthFunc) (GLenum func);
static void (GLAPIENTRY *glDepthMask) (GLboolean flag);
static void (GLAPIENTRY *glDepthRange) (GLclampd zNear, GLclampd zFar);
static void (GLAPIENTRY *glDisable) (GLenum cap);
static void (GLAPIENTRY *glDrawArrays) (GLenum mode, GLint first, GLsizei count);
static void (GLAPIENTRY *glDrawElements) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices);
@@ -107,7 +108,6 @@ public:
static void (GLAPIENTRY *glColor4ub) (GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha);
static void (GLAPIENTRY *glColor4ubv) ( const GLubyte *v );
static void (GLAPIENTRY *glColorPointer) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
static void (GLAPIENTRY *glDepthRange) (GLclampd zNear, GLclampd zFar);
static void (GLAPIENTRY *glDisableClientState) (GLenum array);
static void (GLAPIENTRY *glEnableClientState) (GLenum array);
static void (GLAPIENTRY *glEnd) (void);
@@ -163,7 +163,7 @@ public:
static void (GLAPIENTRY *glVertexPointer) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
/* OpenGL functions which are needed ONLY for implementing GLES 1.1 EXTENSIONS*/
static GLboolean (GLAPIENTRY *glIsRenderbufferEXT) (GLuint renderbuffer);
static GLboolean (GLAPIENTRY *glIsRenderbufferEXT) (GLuint renderbuffer);
static void (GLAPIENTRY *glBindRenderbufferEXT) (GLenum target, GLuint renderbuffer);
static void (GLAPIENTRY *glDeleteRenderbuffersEXT) (GLsizei n, const GLuint *renderbuffers);
static void (GLAPIENTRY *glGenRenderbuffersEXT) (GLsizei n, GLuint *renderbuffers);
@@ -200,6 +200,8 @@ public:
static void (GL_APIENTRY *glBindRenderbuffer)(GLenum target, GLuint renderbuffer);
static void (GL_APIENTRY *glDeleteFramebuffers)(GLsizei n, const GLuint* framebuffers);
static void (GL_APIENTRY *glDeleteRenderbuffers)(GLsizei n, const GLuint* renderbuffers);
static GLboolean (GL_APIENTRY *glIsProgram)(GLuint program);
static GLboolean (GL_APIENTRY *glIsShader)(GLuint shader);
static void (GL_APIENTRY *glVertexAttrib1f)(GLuint indx, GLfloat x);
static void (GL_APIENTRY *glVertexAttrib1fv)(GLuint indx, const GLfloat* values);
static void (GL_APIENTRY *glVertexAttrib2f)(GLuint indx, GLfloat x, GLfloat y);

1
tools/emulator/opengl/host/libs/Translator/include/GLcommon/objectNameManager.h
View File

@@ -28,7 +28,6 @@ enum NamedObjectType {
RENDERBUFFER = 2,
FRAMEBUFFER = 3,
SHADER = 4,
PROGRAM = 5,
NUM_OBJECT_TYPES = 6 // Must be last
};