Ensure we start every frame in the proper GL state

Romain Guy · Romain Guy · commit c189ef532200 · 2012-04-25T20:02:53.000-07:00
Bug #6345013, #6314960

Change-Id: I6985f7f233eb6a5f9223e9f4be3f323154b5dbf0
diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp
@@ -278,6 +278,13 @@ status_t OpenGLRenderer::invokeFunctors(Rect& dirty) {
         }
     }
 
+    // Restore state possibly changed by the functors in process mode
+    GLboolean value;
+    glGetBooleanv(GL_BLEND, &value);
+    mCaches.blend = value;
+
+    mCaches.activeTexture(0);
+
     return result;
 }
 
@@ -2787,6 +2794,7 @@ void OpenGLRenderer::drawTextureMesh(float left, float top, float right, float b
 void OpenGLRenderer::chooseBlending(bool blend, SkXfermode::Mode mode,
         ProgramDescription& description, bool swapSrcDst) {
     blend = blend || mode != SkXfermode::kSrcOver_Mode;
+
     if (blend) {
         // These blend modes are not supported by OpenGL directly and have
         // to be implemented using shaders. Since the shader will perform

Original file line number	Diff line number	Diff line change
`@@ -278,6 +278,13 @@ status_t OpenGLRenderer::invokeFunctors(Rect& dirty) {`
`278`	`278`	`}`
`279`	`279`	`}`
`280`	`280`
	`281`	`+ // Restore state possibly changed by the functors in process mode`
	`282`	`+ GLboolean value;`
	`283`	`+ glGetBooleanv(GL_BLEND, &value);`
	`284`	`+ mCaches.blend = value;`
	`285`	`+`
	`286`	`+ mCaches.activeTexture(0);`
	`287`	`+`
`281`	`288`	`return result;`
`282`	`289`	`}`
`283`	`290`
`@@ -2787,6 +2794,7 @@ void OpenGLRenderer::drawTextureMesh(float left, float top, float right, float b`
`2787`	`2794`	`void OpenGLRenderer::chooseBlending(bool blend, SkXfermode::Mode mode,`
`2788`	`2795`	`ProgramDescription& description, bool swapSrcDst) {`
`2789`	`2796`	`blend = blend \|\| mode != SkXfermode::kSrcOver_Mode;`
	`2797`	`+`
`2790`	`2798`	`if (blend) {`
`2791`	`2799`	`// These blend modes are not supported by OpenGL directly and have`
`2792`	`2800`	`// to be implemented using shaders. Since the shader will perform`