| commit | e2e17e5b238ccd214c72ec1a1864cf391425f09f | [log] [tgz] |
|---|---|---|
| author | Jesse Hall <jessehall@google.com> | Wed Aug 06 17:14:01 2014 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Aug 05 17:41:26 2014 +0000 |
| tree | d998772c8017fe2619ac2da95e26d75c1029c4ce | |
| parent | 8ce28672106956eeff6d0ed2d1d826ec192e58ee [diff] | |
| parent | 0627071cc983aadb8d7447fe222b05d15c7c25be [diff] |
Merge "GlES2: Add NULL check"
diff --git a/opengl/libs/GLES2/gl2.cpp b/opengl/libs/GLES2/gl2.cpp index e112fec..ad9af9f 100644 --- a/opengl/libs/GLES2/gl2.cpp +++ b/opengl/libs/GLES2/gl2.cpp
@@ -183,7 +183,7 @@ 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; }