diff options
| author | Mathias Agopian <mathias@google.com> | 2011-10-27 15:37:33 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-27 15:37:33 -0700 |
| commit | 7165b92e71bc6a1a741a53dc7968af88e7958f39 (patch) | |
| tree | da69ac439e4d3de1a5bf9a5b7990c3389f6a5c3f /services | |
| parent | da57c0e8cf7e5022dd927b51fab3c1a40a8adf54 (diff) | |
| parent | 01d650ed424fa07e864ee11d63f3982a0b266fe6 (diff) | |
| download | frameworks_base-7165b92e71bc6a1a741a53dc7968af88e7958f39.zip frameworks_base-7165b92e71bc6a1a741a53dc7968af88e7958f39.tar.gz frameworks_base-7165b92e71bc6a1a741a53dc7968af88e7958f39.tar.bz2 | |
Merge "fix Corrupted graphics while playing You Tube on orientation change" into ics-mr1
Diffstat (limited to 'services')
| -rw-r--r-- | services/surfaceflinger/SurfaceFlinger.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index e869ba2..a6d4147 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp @@ -1784,8 +1784,10 @@ status_t SurfaceFlinger::renderScreenToTextureLocked(DisplayID dpy, // redraw the screen entirely... glDisable(GL_TEXTURE_EXTERNAL_OES); glDisable(GL_TEXTURE_2D); + glDisable(GL_SCISSOR_TEST); glClearColor(0,0,0,1); glClear(GL_COLOR_BUFFER_BIT); + glEnable(GL_SCISSOR_TEST); glMatrixMode(GL_MODELVIEW); glLoadIdentity(); const Vector< sp<LayerBase> >& layers(mVisibleLayersSortedByZ); |