commit 605f90dc867a18f1ea06203ffa70916f70820f92
author Jamie Gennis <jgennis@google.com> Sun Sep 09 13:00:16 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Sun Sep 09 13:00:16 2012 -0700
tree 585c933327421dec401ba0713936a7b70231c30f
parent 4c05dd175ee3bd5119eecf368742b6510a8cfa6c
parent 01dbf5539bff4bece3f9bbfa55046b04a8a45e99

Merge "SurfaceTexture: use EGL-created native fences" into jb-mr1-dev

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index e11bfa0..ef910d9 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -1728,6 +1728,8 @@
     d.what = DisplayState::eDisplayProjectionChanged;
     d.token = mDefaultDisplays[DisplayDevice::DISPLAY_PRIMARY];
     d.orientation = DisplayState::eOrientationDefault;
+    d.frame.makeInvalid();
+    d.viewport.makeInvalid();
     displays.add(d);
     setTransactionState(state, displays, 0);
 

services/surfaceflinger/Transform.cpp

diff --git a/services/surfaceflinger/Transform.cpp b/services/surfaceflinger/Transform.cpp
index ca3fa6e..aca90e0 100644
--- a/services/surfaceflinger/Transform.cpp
+++ b/services/surfaceflinger/Transform.cpp
@@ -192,7 +192,6 @@
 
 void Transform::transform(float* point, int x, int y) const
 {
-    const mat33& M(mMatrix);
     vec2 v(x, y);
     v = transform(v);
     point[0] = v[0];