Merge "Handle glGetString returning NULL" (cbd23648) · Commits · e / os / android_frameworks_native-old

opengl/libs/EGL/egl_object.cpp

+16 −10

Original line number	Diff line number	Diff line
		@@ -116,6 +116,11 @@ void egl_context_t::onMakeCurrent(EGLSurface draw, EGLSurface read) {
		if (gl_extensions.empty()) {
		// call the implementation's glGetString(GL_EXTENSIONS)
		const char* exts = (const char *)gEGLImpl.hooks[version]->gl.glGetString(GL_EXTENSIONS);

		// If this context is sharing with another context, and the other context was reset
		// e.g. due to robustness failure, this context might also be reset and glGetString can
		// return NULL.
		if (exts) {
		gl_extensions = exts;
		if (gl_extensions.find("GL_EXT_debug_marker") == std::string::npos) {
		gl_extensions.insert(0, "GL_EXT_debug_marker ");
		@@ -130,6 +135,7 @@ void egl_context_t::onMakeCurrent(EGLSurface draw, EGLSurface read) {
		}
		}
		}
		}

		// ----------------------------------------------------------------------------
		}; // namespace android