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

am d20186af: Merge "opengles emulator: GLES2 translator / codec"

Browse Source 
* commit 'd20186af1b4c55b50278189ab29847f78b9f5576':
  opengles emulator: GLES2 translator / codec
This commit is contained in:
David Turner
2011-08-10 02:08:07 -07:00
committed by Android Git Automerger
parent ef1e9fa020 d20186af1b
commit 8bbc54f445
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -778,7 +778,9 @@ GL_APICALL void GL_APIENTRY glGetAttachedShaders(GLuint program, GLsizei maxcou
const GLuint globalProgramName = ctx->shareGroup()->getGlobalName(SHADER,program); const GLuint globalProgramName = ctx->shareGroup()->getGlobalName(SHADER,program);
SET_ERROR_IF(globalProgramName==0, GL_INVALID_VALUE); SET_ERROR_IF(globalProgramName==0, GL_INVALID_VALUE);
ctx->dispatcher().glGetAttachedShaders(globalProgramName,maxcount,count,shaders); ctx->dispatcher().glGetAttachedShaders(globalProgramName,maxcount,count,shaders);
for(int i=0 ; i < *count ;i++){ GLint numShaders=0;
ctx->dispatcher().glGetProgramiv(globalProgramName,GL_ATTACHED_SHADERS,&numShaders);
for(int i=0 ; i < maxcount && i<numShaders ;i++){
shaders[i] = ctx->shareGroup()->getLocalName(SHADER,shaders[i]); shaders[i] = ctx->shareGroup()->getLocalName(SHADER,shaders[i]);
} }
} }

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

@@ -104,6 +104,7 @@ glGetAttachedShaders
len shaders (maxcount*sizeof(GLuint)) len shaders (maxcount*sizeof(GLuint))
dir shaders out dir shaders out
dir count out dir count out
var_flag count nullAllowed
len count (sizeof(GLsizei)) len count (sizeof(GLsizei))
#int glGetAttribLocation(GLuint program, GLchar *name) #int glGetAttribLocation(GLuint program, GLchar *name)