diff options
author | Jason Sams <rjsams@android.com> | 2010-05-18 17:07:49 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-05-18 17:07:49 -0700 |
commit | 29ebdeaa1ff7ff1da404ec88c772474bdc26d900 (patch) | |
tree | c6a27c4397be11cb58a723427eeec02c5c2f241e /res | |
parent | 93c0985c4297903a3a2bc91ffc1af18edf44c112 (diff) | |
parent | 5c1417acfc36499f40d7ffcb1949bc980281d103 (diff) | |
download | android_packages_apps_Trebuchet-29ebdeaa1ff7ff1da404ec88c772474bdc26d900.tar.gz android_packages_apps_Trebuchet-29ebdeaa1ff7ff1da404ec88c772474bdc26d900.tar.bz2 android_packages_apps_Trebuchet-29ebdeaa1ff7ff1da404ec88c772474bdc26d900.zip |
Merge "Fix regression in master. The attempt to remove the last frame hack in all apps caused home to sometimes render black upon returning from an application."
Diffstat (limited to 'res')
-rw-r--r-- | res/raw/allapps.rs | 6 | ||||
-rw-r--r-- | res/raw/allapps_bc.bc | bin | 10200 -> 10212 bytes |
2 files changed, 5 insertions, 1 deletions
diff --git a/res/raw/allapps.rs b/res/raw/allapps.rs index 9342943e4..7eb670a68 100644 --- a/res/raw/allapps.rs +++ b/res/raw/allapps.rs @@ -79,8 +79,12 @@ static int g_Rows; static int g_DrawLastFrame; static int lastFrame(int draw) { + // We draw one extra frame to work around the last frame post bug. + // We also need to track if we drew the last frame to deal with large DT + // in the physics. + int ret = g_DrawLastFrame | draw; g_DrawLastFrame = draw; - return draw; + return ret;//draw; } static void updateReadback() { diff --git a/res/raw/allapps_bc.bc b/res/raw/allapps_bc.bc Binary files differindex d73db54e7..4cb3ecc2b 100644 --- a/res/raw/allapps_bc.bc +++ b/res/raw/allapps_bc.bc |