commit 3e75e82f52053750bacaca94aef0a714ff0f7f75
author Mathias Agopian <mathias@google.com> Wed Aug 28 18:19:48 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Aug 28 18:19:48 2013 -0700
tree b6a975746839878e628a324e293f4a31637aeea9
parent a04a7f1c82891eaae71216a55ef351ad072ede79
parent ecebe12e708e6946821facce1fa05cd86570c33f

am ecebe12e: am 931bda1c: reset the gl viewport at each frame for each display

* commit 'ecebe12e708e6946821facce1fa05cd86570c33f':
  reset the gl viewport at each frame for each display

services/surfaceflinger/DisplayDevice.cpp

diff --git a/services/surfaceflinger/DisplayDevice.cpp b/services/surfaceflinger/DisplayDevice.cpp
index 9708ee3..61a9361 100644
--- a/services/surfaceflinger/DisplayDevice.cpp
+++ b/services/surfaceflinger/DisplayDevice.cpp
@@ -271,9 +271,9 @@
         if (result == EGL_TRUE) {
             if (mType >= DisplayDevice::DISPLAY_VIRTUAL)
                 eglSwapInterval(dpy, 0);
-            setViewportAndProjection();
         }
     }
+    setViewportAndProjection();
     return result;
 }
 

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 9fd3f25..0323cb7 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -2726,6 +2726,7 @@
 
     // compositionComplete is needed for older driver
     hw->compositionComplete();
+    hw->setViewportAndProjection();
 }
 
 
@@ -2805,8 +2806,6 @@
         native_window_api_disconnect(window, NATIVE_WINDOW_API_EGL);
     }
 
-    hw->setViewportAndProjection();
-
     return result;
 }