diff options
| author | Romain Guy <romainguy@google.com> | 2011-11-22 12:35:25 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-22 12:35:25 -0800 |
| commit | a2fabf4a109d46f99ff7370aa05e48c1708c2838 (patch) | |
| tree | dd160fcabedd56f0be6c73850eec81672ef82cf9 | |
| parent | e25ed181070579fca2522112b1659af2fbf8ddfc (diff) | |
| parent | 303a0695b8fa0b8f0095c437145a28633a7a8d92 (diff) | |
| download | frameworks_base-a2fabf4a109d46f99ff7370aa05e48c1708c2838.zip frameworks_base-a2fabf4a109d46f99ff7370aa05e48c1708c2838.tar.gz frameworks_base-a2fabf4a109d46f99ff7370aa05e48c1708c2838.tar.bz2 | |
am 303a0695: Merge "Draw in the correct FBO after invoking a GL functor Bug #5650514" into ics-mr1
* commit '303a0695b8fa0b8f0095c437145a28633a7a8d92':
Draw in the correct FBO after invoking a GL functor Bug #5650514
| -rw-r--r-- | libs/hwui/OpenGLRenderer.cpp | 2 | ||||
| -rw-r--r-- | libs/hwui/Snapshot.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp index 32595e4..7561a47 100644 --- a/libs/hwui/OpenGLRenderer.cpp +++ b/libs/hwui/OpenGLRenderer.cpp @@ -208,7 +208,7 @@ void OpenGLRenderer::resume() { glDisable(GL_DITHER); - glBindFramebuffer(GL_FRAMEBUFFER, getTargetFbo()); + glBindFramebuffer(GL_FRAMEBUFFER, mSnapshot->fbo); glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0); mCaches.blend = true; diff --git a/libs/hwui/Snapshot.h b/libs/hwui/Snapshot.h index d51154d..aff7b93 100644 --- a/libs/hwui/Snapshot.h +++ b/libs/hwui/Snapshot.h @@ -213,7 +213,8 @@ public: Layer* layer; /** - * Only set when the flag kFlagIsFboLayer is set. + * Target FBO used for rendering. Set to 0 when rendering directly + * into the framebuffer. */ GLuint fbo; |