diff options
| author | Jesse Hall <jessehall@google.com> | 2014-08-06 17:22:52 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-06 17:22:52 +0000 |
| commit | 83142a12fbc1249c53551765e3d99b4471b58f19 (patch) | |
| tree | 1e91e4a1bcf82061857104a161d4ed3e424d86c9 /opengl/libs | |
| parent | 776a27890567816c5ba9bcbd78074d16ed9dbc6b (diff) | |
| parent | e2e17e5b238ccd214c72ec1a1864cf391425f09f (diff) | |
| download | frameworks_native-83142a12fbc1249c53551765e3d99b4471b58f19.zip frameworks_native-83142a12fbc1249c53551765e3d99b4471b58f19.tar.gz frameworks_native-83142a12fbc1249c53551765e3d99b4471b58f19.tar.bz2 | |
am e2e17e5b: Merge "GlES2: Add NULL check"
* commit 'e2e17e5b238ccd214c72ec1a1864cf391425f09f':
GlES2: Add NULL check
Diffstat (limited to 'opengl/libs')
| -rw-r--r-- | opengl/libs/GLES2/gl2.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/opengl/libs/GLES2/gl2.cpp b/opengl/libs/GLES2/gl2.cpp index b07228f..0157bfe 100644 --- a/opengl/libs/GLES2/gl2.cpp +++ b/opengl/libs/GLES2/gl2.cpp @@ -180,7 +180,7 @@ const GLubyte * glGetString(GLenum name) const GLubyte * ret = egl_get_string_for_current_context(name); if (ret == NULL) { gl_hooks_t::gl_t const * const _c = &getGlThreadSpecific()->gl; - ret = _c->glGetString(name); + if(_c) ret = _c->glGetString(name); } return ret; } |