diff options
| author | Mathias Agopian <mathias@google.com> | 2012-09-26 18:48:54 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-26 18:48:54 -0700 |
| commit | 1e83690c6030b33c7776fa65cb57132d5e2d0b40 (patch) | |
| tree | f5e0736259a28ebe3c3ff92d9325dc8dcf8af2b7 /opengl | |
| parent | e206549ccf23ec5ba95062f944674e58569c8065 (diff) | |
| parent | 455e3601498096d1daa0cf0ec7c23abb28b39af3 (diff) | |
| download | frameworks_native-1e83690c6030b33c7776fa65cb57132d5e2d0b40.zip frameworks_native-1e83690c6030b33c7776fa65cb57132d5e2d0b40.tar.gz frameworks_native-1e83690c6030b33c7776fa65cb57132d5e2d0b40.tar.bz2 | |
Merge "assert -eng builds when calling a GL function without a context" into jb-mr1-dev
Diffstat (limited to 'opengl')
| -rw-r--r-- | opengl/libs/EGL/egl.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/opengl/libs/EGL/egl.cpp b/opengl/libs/EGL/egl.cpp index b658240..7ca210c 100644 --- a/opengl/libs/EGL/egl.cpp +++ b/opengl/libs/EGL/egl.cpp @@ -166,8 +166,13 @@ void setGLHooksThreadSpecific(gl_hooks_t const *value) { static int gl_no_context() { if (egl_tls_t::logNoContextCall()) { - ALOGE("call to OpenGL ES API with no current context " - "(logged once per thread)"); + char const* const error = "call to OpenGL ES API with " + "no current context (logged once per thread)"; + if (LOG_NDEBUG) { + ALOGE(error); + } else { + LOG_ALWAYS_FATAL(error); + } char value[PROPERTY_VALUE_MAX]; property_get("debug.egl.callstack", value, "0"); if (atoi(value)) { |