summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Romain Guy <romainguy@google.com> 2010-10-19 11:46:15 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2010-10-19 11:46:15 -0700
commit24a7d5d053222cc3fb19ddd442c58bc4ac2c110c (patch)
tree22cdd013b4f2bda7c24ba8cde8f24b5686af186d
parentd793f14fc9225d889c827957c388bb4557a609d7 (diff)
parent50c0f093d942a59d4e01b2c76d26c0e9d6ed796c (diff)
Merge "Solve rendering issue with embedded WebViews. Bug #3094017"
-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);
}
///////////////////////////////////////////////////////////////////////////////