Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 303a0695: Merge "Draw in the correct FBO after invoking a GL functor Bug #5650514" into ics-mr1

Browse Source 
* commit '303a0695b8fa0b8f0095c437145a28633a7a8d92':
  Draw in the correct FBO after invoking a GL functor Bug #5650514
This commit is contained in:
Romain Guy
2011-11-22 12:35:25 -08:00
committed by Android Git Automerger
parent e25ed18107 303a0695b8
commit a2fabf4a10
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/hwui/OpenGLRenderer.cpp
View File

@@ -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;

3
libs/hwui/Snapshot.h
View File

@@ -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;