diff options
| author | 2011-11-28 15:45:32 -0800 | |
|---|---|---|
| committer | 2011-11-28 15:45:32 -0800 | |
| commit | 3892889952b0ad3fa0b095c96d8ae2ae110585e2 (patch) | |
| tree | 61cc955ed589c52b974c184851e35d862f2e400d /libs/hwui/OpenGLRenderer.cpp | |
| parent | 70a1ee38b24a7c8dfc789db024bdf54f277ddba3 (diff) | |
| parent | 8990cb5768efba46bb1d7458377dd44498afcfdb (diff) | |
am 8990cb57: Merge "Fix flashing wifi dialog after rotating back from landscape." into ics-mr1
* commit '8990cb5768efba46bb1d7458377dd44498afcfdb':
Fix flashing wifi dialog after rotating back from landscape.
Diffstat (limited to 'libs/hwui/OpenGLRenderer.cpp')
| -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 7561a47fa533..4d226461a02a 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; |