Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Move functor GL setup to just before functor" into klp-dev

Browse Source
This commit is contained in:
Chris Craik
2013-08-26 20:50:50 +00:00
committed by Android (Google) Code Review
parent aad4417868 54f574acf4
commit ff2c22e2a8
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libs/hwui/OpenGLRenderer.cpp
View File

@@ -449,14 +449,8 @@ status_t OpenGLRenderer::invokeFunctors(Rect& dirty) {
status_t OpenGLRenderer::callDrawGLFunction(Functor* functor, Rect& dirty) {
if (mSnapshot->isIgnored()) return DrawGlInfo::kStatusDone;
interrupt();
detachFunctor(functor);
mCaches.enableScissor();
if (mDirtyClip) {
setScissorFromClip();
setStencilFromClip();
}
Rect clip(*mSnapshot->clipRect);
clip.snapToPixelBoundaries();
@@ -477,6 +471,15 @@ status_t OpenGLRenderer::callDrawGLFunction(Functor* functor, Rect& dirty) {
info.height = getSnapshot()->height;
getSnapshot()->transform->copyTo(&info.transform[0]);
// setup GL state for functor
if (mDirtyClip) {
setScissorFromClip();
setStencilFromClip(); // can issue draws, so must precede enableScissor()/interrupt()
}
mCaches.enableScissor();
interrupt();
// call functor immediately after GL state setup
status_t result = (*functor)(DrawGlInfo::kModeDraw, &info);
if (result != DrawGlInfo::kStatusDone) {