commit 8e5ca2a9908031ea589723319bb74314929e3f38
author Chris Craik <ccraik@google.com> Mon Sep 21 15:59:55 2015 -0700
committer Chris Craik <ccraik@google.com> Mon Sep 21 16:00:14 2015 -0700
tree a7719a79b7f10b8adb4933c3f436f19c2ee23885
parent 0e35962e6d5a1ca534040f3da3fd04ad505499f9

Remove legacy enable/disable methods from Blend

Change-Id: I147f96d1fbdd34b9d056620e7259a9f96b13fea7

libs/hwui/renderstate/Blend.cpp

diff --git a/libs/hwui/renderstate/Blend.cpp b/libs/hwui/renderstate/Blend.cpp
index b21e15e..93f787d 100644
--- a/libs/hwui/renderstate/Blend.cpp
+++ b/libs/hwui/renderstate/Blend.cpp
@@ -98,20 +98,6 @@
     // gl blending off by default
 }
 
-void Blend::enable(SkXfermode::Mode mode, ModeOrderSwap modeUsage) {
-    GLenum srcMode;
-    GLenum dstMode;
-    getFactors(mode, modeUsage, &srcMode, &dstMode);
-    setFactors(srcMode, dstMode);
-}
-
-void Blend::disable() {
-    if (mEnabled) {
-        glDisable(GL_BLEND);
-        mEnabled = false;
-    }
-}
-
 void Blend::invalidate() {
     syncEnabled();
     mSrcMode = mDstMode = GL_ZERO;
@@ -132,8 +118,13 @@
 
 void Blend::setFactors(GLenum srcMode, GLenum dstMode) {
     if (srcMode == GL_ZERO && dstMode == GL_ZERO) {
-        disable();
+        // disable blending
+        if (mEnabled) {
+            glDisable(GL_BLEND);
+            mEnabled = false;
+        }
     } else {
+        // enable blending
         if (!mEnabled) {
             glEnable(GL_BLEND);
             mEnabled = true;

libs/hwui/renderstate/Blend.h

diff --git a/libs/hwui/renderstate/Blend.h b/libs/hwui/renderstate/Blend.h
index dcc681d..df9e5a8 100644
--- a/libs/hwui/renderstate/Blend.h
+++ b/libs/hwui/renderstate/Blend.h
@@ -34,9 +34,6 @@
         NoSwap,
         Swap,
     };
-
-    void enable(SkXfermode::Mode mode, ModeOrderSwap modeUsage);
-    void disable();
     void syncEnabled();
 
     static void getFactors(SkXfermode::Mode mode, ModeOrderSwap modeUsage,