commit 44eb2c00861098dd3e2950d923646814b4cc57c2
author Chris Craik <ccraik@google.com> Thu Jan 29 09:45:09 2015 -0800
committer Chris Craik <ccraik@google.com> Fri Jan 30 10:49:05 2015 -0800
tree 2d232b14b931137cc7ebb3b012c3ce4530fa5cf4
parent 1b68ce327aa37ee0c4e9580d75cb6781337c4312

Refactor blending and texture gl state

Change-Id: Ia6b3c8b2afd3dfcee7f3ce401d846b789612054a

libs/hwui/renderstate/RenderState.cpp

diff --git a/libs/hwui/renderstate/RenderState.cpp b/libs/hwui/renderstate/RenderState.cpp
index e4c8745..f913cd9 100644
--- a/libs/hwui/renderstate/RenderState.cpp
+++ b/libs/hwui/renderstate/RenderState.cpp
@@ -23,10 +23,6 @@
 
 RenderState::RenderState(renderthread::RenderThread& thread)
         : mRenderThread(thread)
-        , mCaches(nullptr)
-        , mMeshState(nullptr)
-        , mScissor(nullptr)
-        , mStencil(nullptr)
         , mViewportWidth(0)
         , mViewportHeight(0)
         , mFramebuffer(0) {
@@ -34,13 +30,14 @@
 }
 
 RenderState::~RenderState() {
-    LOG_ALWAYS_FATAL_IF(mMeshState || mScissor || mStencil,
+    LOG_ALWAYS_FATAL_IF(mBlend || mMeshState || mScissor || mStencil,
             "State object lifecycle not managed correctly");
 }
 
 void RenderState::onGLContextCreated() {
-    LOG_ALWAYS_FATAL_IF(mMeshState || mScissor || mStencil,
+    LOG_ALWAYS_FATAL_IF(mBlend || mMeshState || mScissor || mStencil,
             "State object lifecycle not managed correctly");
+    mBlend = new Blend();
     mMeshState = new MeshState();
     mScissor = new Scissor();
     mStencil = new Stencil();
@@ -92,6 +89,10 @@
     std::for_each(mActiveLayers.begin(), mActiveLayers.end(), layerLostGlContext);
     mAssetAtlas.terminate();
 
+    mCaches->terminate();
+
+    delete mBlend;
+    mBlend = nullptr;
     delete mMeshState;
     mMeshState = nullptr;
     delete mScissor;
@@ -132,7 +133,7 @@
             mCaches->currentProgram = nullptr;
         }
     }
-    mCaches->resetActiveTexture();
+    mCaches->textureState().resetActiveTexture();
     meshState().unbindMeshBuffer();
     meshState().unbindIndicesBuffer();
     meshState().resetVertexPointers();
@@ -148,14 +149,10 @@
     glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
 
     scissor().invalidate();
+    blend().invalidate();
 
-    mCaches->activeTexture(0);
-    mCaches->resetBoundTextures();
-
-    mCaches->blend = true;
-    glEnable(GL_BLEND);
-    glBlendFunc(mCaches->lastSrcMode, mCaches->lastDstMode);
-    glBlendEquation(GL_FUNC_ADD);
+    mCaches->textureState().activateTexture(0);
+    mCaches->textureState().resetBoundTextures();
 }
 
 void RenderState::debugOverdraw(bool enable, bool clear) {