summaryrefslogtreecommitdiff
path: root/services/surfaceflinger/LayerBase.cpp
diff options
context:
space:
mode:
author Mathias Agopian <mathias@google.com> 2010-10-12 13:57:09 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-10-12 13:57:09 -0700
commiteb8f8980d4c67347d45bfc27cdf52f2c2c636c34 (patch)
treeb7cfdbd700510f6ee301d28fb58f03617624ed2c /services/surfaceflinger/LayerBase.cpp
parent09e5687757296a4d8d2a5e5353b31dc5de14b423 (diff)
parentc6f607dcdd6a3322619d3e3ef4a10d93c8c082f5 (diff)
am 5d477279: am cf6b2765: Merge "fix a bug where FLIP_H would do a 180 rotation" into gingerbread
Merge commit '5d477279e6e41c9d61abe66dcded5c57a51e2c78' * commit '5d477279e6e41c9d61abe66dcded5c57a51e2c78': fix a bug where FLIP_H would do a 180 rotation
Diffstat (limited to 'services/surfaceflinger/LayerBase.cpp')
-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 14191cbc21..8ab5a10863 100644
--- a/services/surfaceflinger/LayerBase.cpp
+++ b/services/surfaceflinger/LayerBase.cpp
@@ -453,11 +453,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];