am a975a844: am 70e5db94: Merge "Fix crash in kModeProcessNoContext" into mnc-dev (e28c5d62) · Commits · e / os / android_frameworks_base

libs/hwui/renderstate/RenderState.cpp

+9 −3

Original line number	Diff line number	Diff line
		@@ -124,10 +124,16 @@ void RenderState::bindFramebuffer(GLuint fbo) {
		}

		void RenderState::invokeFunctor(Functor* functor, DrawGlInfo::Mode mode, DrawGlInfo* info) {
		if (mode == DrawGlInfo::kModeProcessNoContext) {
		// If there's no context we don't need to interrupt as there's
		// no gl state to save/restore
		(*functor)(mode, info);
		} else {
		interruptForFunctorInvoke();
		(*functor)(mode, info);
		resumeFromFunctorInvoke();
		}
		}

		void RenderState::interruptForFunctorInvoke() {
		mCaches->setProgram(nullptr);