commit f607bdc167f66b3e7003acaa4736ae46d78c1492
author Romain Guy <romainguy@google.com> Fri Sep 10 19:20:06 2010 -0700
committer Romain Guy <romainguy@google.com> Sun Sep 12 12:24:12 2010 -0700
tree b3b4fb761b25d08ba836ff822f6e72d85b5be695
parent d14f0dfd58af653a2d41424d472fe97de6af0a78

Correct implementation of saveLayer().

Change-Id: I5375126636913e0a84f2d6bbd0ebe40d2e4f2763

libs/hwui/ProgramCache.cpp

diff --git a/libs/hwui/ProgramCache.cpp b/libs/hwui/ProgramCache.cpp
index ff65c1b..becbc22 100644
--- a/libs/hwui/ProgramCache.cpp
+++ b/libs/hwui/ProgramCache.cpp
@@ -119,6 +119,8 @@
         "    gl_FragColor = fragColor;\n";
 const char* gFS_Main_FragColor_Blend =
         "    gl_FragColor = blendFramebuffer(fragColor, gl_LastFragColor);\n";
+const char* gFS_Main_FragColor_Blend_Swap =
+        "    gl_FragColor = blendFramebuffer(gl_LastFragColor, fragColor);\n";
 const char* gFS_Main_ApplyColorOp[4] = {
         // None
         "",
@@ -376,7 +378,8 @@
         if (!blendFramebuffer) {
             shader.append(gFS_Main_FragColor);
         } else {
-            shader.append(gFS_Main_FragColor_Blend);
+            shader.append(!description.swapSrcDst ?
+                    gFS_Main_FragColor_Blend : gFS_Main_FragColor_Blend_Swap);
         }
     }
     // End the shader