summaryrefslogtreecommitdiffstats
path: root/opengl
diff options
context:
space:
mode:
authorDavid Turner <digit@android.com>2014-07-24 13:28:52 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-07-24 13:28:52 +0000
commitef45e9547d34c1085a38b25c4fdc1c4e6b3d0caf (patch)
treed716113b05ab1ee15923e3412d24fbb4d4e187ae /opengl
parentcfe0a3033e4f2bc5f824cfc9989b84685f5a10c3 (diff)
parent638ee524f83053613c47ddea22c4bf98a0175c2f (diff)
downloadandroid_device_generic_goldfish-ef45e9547d34c1085a38b25c4fdc1c4e6b3d0caf.tar.gz
android_device_generic_goldfish-ef45e9547d34c1085a38b25c4fdc1c4e6b3d0caf.tar.bz2
android_device_generic_goldfish-ef45e9547d34c1085a38b25c4fdc1c4e6b3d0caf.zip
am 638ee524: Merge "Remove display initialization from eglGetProcAddress API"
* commit '638ee524f83053613c47ddea22c4bf98a0175c2f': Remove display initialization from eglGetProcAddress API
Diffstat (limited to 'opengl')
-rw-r--r--opengl/system/egl/egl.cpp9
1 files changed, 0 insertions, 9 deletions
diff --git a/opengl/system/egl/egl.cpp b/opengl/system/egl/egl.cpp
index 72e0037..daa52de 100644
--- a/opengl/system/egl/egl.cpp
+++ b/opengl/system/egl/egl.cpp
@@ -526,15 +526,6 @@ __eglMustCastToProperFunctionPointerType eglGetProcAddress(const char *procname)
}
}
- //
- // Make sure display is initialized before searching in client APIs
- //
- if (!s_display.initialized()) {
- if (!s_display.initialize(&s_eglIface)) {
- return NULL;
- }
- }
-
// look in gles client api's extensions table
return (__eglMustCastToProperFunctionPointerType)ClientAPIExts::getProcAddress(procname);