summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Romain Guy <romainguy@google.com> 2010-10-19 11:42:22 -0700
committer Romain Guy <romainguy@google.com> 2010-10-19 11:42:22 -0700
commit50c0f093d942a59d4e01b2c76d26c0e9d6ed796c (patch)
treee3ba1ae68c0694bfcfca0c5c538b034ac86ca8b4
parent29d9849fd7b8b49c26fe7e7bae0ba01e907dc1b7 (diff)
Solve rendering issue with embedded WebViews.
Bug #3094017 The blending mode was not appropriately set after WebView released the context. Change-Id: Ib36d48e82c12f6d131dd5a0bcde9106925b8da63
-rw-r--r--libs/hwui/OpenGLRenderer.cpp13
1 files changed, 5 insertions, 8 deletions
diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp
index 5ab5f0655292..633d77831052 100644
--- a/libs/hwui/OpenGLRenderer.cpp
+++ b/libs/hwui/OpenGLRenderer.cpp
@@ -168,6 +168,7 @@ void OpenGLRenderer::acquireContext() {
mCaches.currentProgram = NULL;
}
}
+ mCaches.unbindMeshBuffer();
}
void OpenGLRenderer::releaseContext() {
@@ -180,15 +181,11 @@ void OpenGLRenderer::releaseContext() {
glBindFramebuffer(GL_FRAMEBUFFER, 0);
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
- mCaches.bindMeshBuffer();
- if (mCaches.blend) {
- glEnable(GL_BLEND);
- glBlendFunc(mCaches.lastSrcMode, mCaches.lastDstMode);
- glBlendEquation(GL_FUNC_ADD);
- } else {
- glDisable(GL_BLEND);
- }
+ mCaches.blend = true;
+ glEnable(GL_BLEND);
+ glBlendFunc(mCaches.lastSrcMode, mCaches.lastDstMode);
+ glBlendEquation(GL_FUNC_ADD);
}
///////////////////////////////////////////////////////////////////////////////