diff options
author | Mathias Agopian <mathias@google.com> | 2010-11-10 14:15:57 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-11-10 14:15:57 -0800 |
commit | d6c7893d663aa74840bb491ddbce500bc0752ac5 (patch) | |
tree | 0618d335092a58276894f611c2425e98c1df81eb /opengl | |
parent | bf44ebae04f837596b9942ccb15d3d47bad4acec (diff) | |
parent | 17fd21fc0638d8734867b6f189efbabb227f3ae1 (diff) | |
download | frameworks_base-d6c7893d663aa74840bb491ddbce500bc0752ac5.zip frameworks_base-d6c7893d663aa74840bb491ddbce500bc0752ac5.tar.gz frameworks_base-d6c7893d663aa74840bb491ddbce500bc0752ac5.tar.bz2 |
am 17fd21fc: Merge "DO NOT MERGE. workaround [3177481] eglGetProcAddress() returns the wrong pointer for some GL extensions" into gingerbread
* commit '17fd21fc0638d8734867b6f189efbabb227f3ae1':
DO NOT MERGE. workaround [3177481] eglGetProcAddress() returns the wrong pointer for some GL extensions
Diffstat (limited to 'opengl')
-rw-r--r-- | opengl/libs/EGL/egl.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/opengl/libs/EGL/egl.cpp b/opengl/libs/EGL/egl.cpp index 2d1a278..ab260d5 100644 --- a/opengl/libs/EGL/egl.cpp +++ b/opengl/libs/EGL/egl.cpp @@ -407,6 +407,10 @@ static const extention_map_t gExtentionMap[] = { (__eglMustCastToProperFunctionPointerType)&eglDestroyImageKHR }, { "eglSetSwapRectangleANDROID", (__eglMustCastToProperFunctionPointerType)&eglSetSwapRectangleANDROID }, + { "glEGLImageTargetTexture2DOES", + (__eglMustCastToProperFunctionPointerType)NULL }, + { "glEGLImageTargetRenderbufferStorageOES", + (__eglMustCastToProperFunctionPointerType)NULL }, }; extern const __eglMustCastToProperFunctionPointerType gExtensionForwarders[MAX_NUMBER_OF_GL_EXTENSIONS]; |