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

Merge "Fix crash in kModeProcessNoContext" into mnc-dev

Browse Source
This commit is contained in:
John Reck
2015-08-04 19:38:15 +00:00
committed by Android (Google) Code Review
parent 35a1a2095c 95cd24bb9d
commit 70e5db9413
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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