summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2010-10-11 14:37:57 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-10-11 14:37:57 -0700
commitcf6b2765ae7ea6305754e253264012b8f0498f7b (patch)
tree0630f06b84ca504ebd886dc2ca18976e4bba3f33
parentd0528b74b6de87c415ea498095e142d52c68875b (diff)
parent5ba59975ebd31faf8049b8b1cbd707ebbb32806f (diff)
downloadframeworks_base-cf6b2765ae7ea6305754e253264012b8f0498f7b.zip
frameworks_base-cf6b2765ae7ea6305754e253264012b8f0498f7b.tar.gz
frameworks_base-cf6b2765ae7ea6305754e253264012b8f0498f7b.tar.bz2
Merge "fix a bug where FLIP_H would do a 180 rotation" into gingerbread
-rw-r--r--services/surfaceflinger/LayerBase.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/services/surfaceflinger/LayerBase.cpp b/services/surfaceflinger/LayerBase.cpp
index 758b408..069b85a 100644
--- a/services/surfaceflinger/LayerBase.cpp
+++ b/services/surfaceflinger/LayerBase.cpp
@@ -444,11 +444,11 @@ void LayerBase::drawWithOpenGL(const Region& clip, const Texture& texture) const
}
if (transform & HAL_TRANSFORM_FLIP_V) {
swap(vLT, vLB);
- swap(vRB, vRT);
+ swap(vRT, vRB);
}
if (transform & HAL_TRANSFORM_FLIP_H) {
- swap(vLT, vRB);
- swap(vLB, vRT);
+ swap(vLT, vRT);
+ swap(vLB, vRB);
}
TexCoords texCoords[4];