drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 70e5db94: Merge "Fix crash in kModeProcessNoContext" into mnc-dev

Browse Source 
* commit '70e5db9413f82bf1f000bd99b3d2dbecf6e4ab04':
  Fix crash in kModeProcessNoContext
This commit is contained in:
John Reck
2015-08-04 19:48:30 +00:00
committed by Android Git Automerger
parent 36fc79e2f8 70e5db9413
commit a975a84498
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libs/hwui/renderstate/RenderState.cpp
View File

@ -124,9 +124,15 @@ void RenderState::bindFramebuffer(GLuint fbo) {
}
void RenderState::invokeFunctor(Functor* functor, DrawGlInfo::Mode mode, DrawGlInfo* info) {
interruptForFunctorInvoke();
(*functor)(mode, info);
resumeFromFunctorInvoke();
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() {