am 1e83690c: Merge "assert -eng builds when calling a GL function without a context" into jb-mr1-dev

* commit '1e83690c6030b33c7776fa65cb57132d5e2d0b40':
  assert -eng builds when calling a GL function without a context
This commit is contained in:
Mathias Agopian 2012-09-26 18:50:13 -07:00 committed by Android Git Automerger
commit 2ac4194854
1 changed files with 7 additions and 2 deletions

View File

@ -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)) {