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

am 7fb8f627: am fa60dc0a: am c3349b5a: Merge "emulator egl translator: Fix eglGetProcAddress."

Browse Source 
* commit '7fb8f627b48ba517309d4ea3dbe9ed9a92459a19':
  emulator egl translator: Fix eglGetProcAddress.
This commit is contained in:
David Turner
2011-06-21 11:44:14 -07:00
committed by Android Git Automerger
parent cdb5dd3550 7fb8f627b4
commit 6d9eb60463
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/emulator/opengl/host/libs/Translator/EGL/EglImp.cpp
View File

@@ -69,6 +69,8 @@ static ExtentionDescriptor s_eglExtentions[] = {
{"eglCreateImageKHR" ,(__eglMustCastToProperFunctionPointerType)eglCreateImageKHR}, {"eglCreateImageKHR" ,(__eglMustCastToProperFunctionPointerType)eglCreateImageKHR},
{"eglDestroyImageKHR",(__eglMustCastToProperFunctionPointerType)eglDestroyImageKHR} {"eglDestroyImageKHR",(__eglMustCastToProperFunctionPointerType)eglDestroyImageKHR}
}; };
static int s_eglExtentionsSize = sizeof(s_eglExtentions) /
sizeof(ExtentionDescriptor);
/****************************************************************************************************************************************/ /****************************************************************************************************************************************/
//macros for accessing global egl info & tls objects //macros for accessing global egl info & tls objects
@@ -213,7 +215,7 @@ EGLAPI const char * EGLAPIENTRY eglQueryString(EGLDisplay display, EGLint name)
VALIDATE_DISPLAY(display); VALIDATE_DISPLAY(display);
static const char* vendor = "Google"; static const char* vendor = "Google";
static const char* version = "1.4"; static const char* version = "1.4";
static const char* extensions = "EGL_KHR_image_base EGL_KHR_gl_texture_2d_image"; static const char* extensions = "EGL_KHR_image_base EGL_KHR_gl_texture_2D_image";
if(!EglValidate::stringName(name)) { if(!EglValidate::stringName(name)) {
RETURN_ERROR(NULL,EGL_BAD_PARAMETER); RETURN_ERROR(NULL,EGL_BAD_PARAMETER);
} }
@@ -958,7 +960,7 @@ EGLAPI __eglMustCastToProperFunctionPointerType EGLAPIENTRY
eglGetProcAddress(const char *procname){ eglGetProcAddress(const char *procname){
__eglMustCastToProperFunctionPointerType retVal = NULL; __eglMustCastToProperFunctionPointerType retVal = NULL;
if(!strncmp(procname,"egl",3)) { //EGL proc if(!strncmp(procname,"egl",3)) { //EGL proc
for(int i=0;i < EGL_EXTENSIONS;i++){ for(int i=0;i < s_eglExtentionsSize;i++){
if(strcmp(procname,s_eglExtentions[i].name) == 0){ if(strcmp(procname,s_eglExtentions[i].name) == 0){
retVal = s_eglExtentions[i].address; retVal = s_eglExtentions[i].address;
break; break;