diff options
| author | Chet Haase <chet@google.com> | 2011-11-28 15:47:16 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-28 15:47:16 -0800 |
| commit | d3ea6b40bb8f0fbc2a877963db1ab4fa0fc02b2f (patch) | |
| tree | 2f0be21ad21c6efc24597d5cadbadd5645da091c /libs/hwui | |
| parent | 589364c7179e764f4e8b9c0d53f45a1abf528aa8 (diff) | |
| parent | 3892889952b0ad3fa0b095c96d8ae2ae110585e2 (diff) | |
| download | frameworks_base-d3ea6b40bb8f0fbc2a877963db1ab4fa0fc02b2f.zip frameworks_base-d3ea6b40bb8f0fbc2a877963db1ab4fa0fc02b2f.tar.gz frameworks_base-d3ea6b40bb8f0fbc2a877963db1ab4fa0fc02b2f.tar.bz2 | |
am 38928899: am 8990cb57: Merge "Fix flashing wifi dialog after rotating back from landscape." into ics-mr1
* commit '3892889952b0ad3fa0b095c96d8ae2ae110585e2':
Fix flashing wifi dialog after rotating back from landscape.
Diffstat (limited to 'libs/hwui')
| -rw-r--r-- | libs/hwui/OpenGLRenderer.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp index 0b5262d..718c131 100644 --- a/libs/hwui/OpenGLRenderer.cpp +++ b/libs/hwui/OpenGLRenderer.cpp @@ -201,14 +201,16 @@ void OpenGLRenderer::interrupt() { } void OpenGLRenderer::resume() { - glViewport(0, 0, mSnapshot->viewport.getWidth(), mSnapshot->viewport.getHeight()); + sp<Snapshot> snapshot = (mSnapshot != NULL) ? mSnapshot : mFirstSnapshot; + + glViewport(0, 0, snapshot->viewport.getWidth(), snapshot->viewport.getHeight()); glEnable(GL_SCISSOR_TEST); dirtyClip(); glDisable(GL_DITHER); - glBindFramebuffer(GL_FRAMEBUFFER, mSnapshot->fbo); + glBindFramebuffer(GL_FRAMEBUFFER, snapshot->fbo); glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0); mCaches.blend = true; |