diff options
author | Mathias Agopian <mathias@google.com> | 2010-08-24 17:56:40 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-24 17:56:40 -0700 |
commit | bce2e90ca9bc2277a4816b7996f84506df411cf9 (patch) | |
tree | 2a1902282acfebe7f68a202a4c43ffbeb0e9df6d /services/surfaceflinger/LayerBlur.cpp | |
parent | 8d9d751a8f09a0199d1d22a3f8267eb51f919cc0 (diff) | |
parent | bc4389edfbb5777aec1a9af7863b2ca3ade2fa64 (diff) | |
download | frameworks_base-bce2e90ca9bc2277a4816b7996f84506df411cf9.zip frameworks_base-bce2e90ca9bc2277a4816b7996f84506df411cf9.tar.gz frameworks_base-bce2e90ca9bc2277a4816b7996f84506df411cf9.tar.bz2 |
am bc4389ed: am 8395b462: Merge "fix [2931513] Add support for setting the orientation of an ANativeWindow" into gingerbread
Merge commit 'bc4389edfbb5777aec1a9af7863b2ca3ade2fa64'
* commit 'bc4389edfbb5777aec1a9af7863b2ca3ade2fa64':
fix [2931513] Add support for setting the orientation of an ANativeWindow
Diffstat (limited to 'services/surfaceflinger/LayerBlur.cpp')
-rw-r--r-- | services/surfaceflinger/LayerBlur.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/services/surfaceflinger/LayerBlur.cpp b/services/surfaceflinger/LayerBlur.cpp index 64a43c7..2ee21b9 100644 --- a/services/surfaceflinger/LayerBlur.cpp +++ b/services/surfaceflinger/LayerBlur.cpp @@ -241,6 +241,8 @@ void LayerBlur::onDraw(const Region& clip) const glDrawArrays(GL_TRIANGLE_FAN, 0, 4); } glDisableClientState(GL_TEXTURE_COORD_ARRAY); + glLoadIdentity(); + glMatrixMode(GL_MODELVIEW); } } |