Merge "fix functor flag parsing, tweak process delay"

ChrisCraik · Android (Google) Code Review · commit 3d4d2159bc84 · 2012-04-06T12:51:36.000-07:00
diff --git a/core/java/android/view/HardwareRenderer.java b/core/java/android/view/HardwareRenderer.java
@@ -526,7 +526,7 @@ static abstract class GlRenderer extends HardwareRenderer {
         static final int SURFACE_STATE_SUCCESS = 1;
         static final int SURFACE_STATE_UPDATED = 2;
 
-        static final int FUNCTOR_PROCESS_DELAY = 2;
+        static final int FUNCTOR_PROCESS_DELAY = 4;
 
         static EGL10 sEgl;
         static EGLDisplay sEglDisplay;
diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp
@@ -260,7 +260,7 @@ status_t OpenGLRenderer::invokeFunctors(Rect& dirty) {
             Rect localDirty(info.dirtyLeft, info.dirtyTop, info.dirtyRight, info.dirtyBottom);
             dirty.unionWith(localDirty);
 
-            if (result == DrawGlInfo::kStatusInvoke) {
+            if (result & DrawGlInfo::kStatusInvoke) {
                 mFunctors.push(f);
             }
         }
@@ -300,7 +300,7 @@ status_t OpenGLRenderer::callDrawGLFunction(Functor* functor, Rect& dirty) {
         Rect localDirty(info.dirtyLeft, info.dirtyTop, info.dirtyRight, info.dirtyBottom);
         dirty.unionWith(localDirty);
 
-        if (result == DrawGlInfo::kStatusInvoke) {
+        if (result & DrawGlInfo::kStatusInvoke) {
             mFunctors.push(functor);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -260,7 +260,7 @@ status_t OpenGLRenderer::invokeFunctors(Rect& dirty) {`
`260`	`260`	`Rect localDirty(info.dirtyLeft, info.dirtyTop, info.dirtyRight, info.dirtyBottom);`
`261`	`261`	`dirty.unionWith(localDirty);`
`262`	`262`
`263`		`- if (result == DrawGlInfo::kStatusInvoke) {`
	`263`	`+ if (result & DrawGlInfo::kStatusInvoke) {`
`264`	`264`	`mFunctors.push(f);`
`265`	`265`	`}`
`266`	`266`	`}`
`@@ -300,7 +300,7 @@ status_t OpenGLRenderer::callDrawGLFunction(Functor* functor, Rect& dirty) {`
`300`	`300`	`Rect localDirty(info.dirtyLeft, info.dirtyTop, info.dirtyRight, info.dirtyBottom);`
`301`	`301`	`dirty.unionWith(localDirty);`
`302`	`302`
`303`		`- if (result == DrawGlInfo::kStatusInvoke) {`
	`303`	`+ if (result & DrawGlInfo::kStatusInvoke) {`
`304`	`304`	`mFunctors.push(functor);`
`305`	`305`	`}`
`306`	`306`	`}`