gl programs rewrite

src/gpu/GrOptDrawState.cpp

Index: src/gpu/GrOptDrawState.cpp
diff --git a/src/gpu/GrOptDrawState.cpp b/src/gpu/GrOptDrawState.cpp
index 6a79203d1a0bcaded4bb6b0fd83387341f391e80..e97070e4c30af82f52b1135fbd541d019888839f 100644
--- a/src/gpu/GrOptDrawState.cpp
+++ b/src/gpu/GrOptDrawState.cpp
@@ -167,6 +167,14 @@ void GrOptDrawState::removeFixedFunctionVertexAttribs(uint8_t removeVAFlag) {
 }
 
 void GrOptDrawState::copyEffectiveColorStages(const GrDrawState& ds) {
+    // If color write is disabled, then we don't want to copy any color stages and we should remove
+    // the fixed function color vertex attribute as well
+    if (this->isColorWriteDisabled()) {

[bsalomon, 2014/10/06 14:29:04]

Greg is this the right place for this? Anywhere else we should be looking at
this value? It seems like we can make the blend flags be 0,1 in this case in the
blend opts stuff.

[egdaniel, 2014/10/07 13:46:13]

It is already checked in the normal flow of creating an optimized state and
simply sets the blend coeffs to 0,1 and we skip draw. Just landed a change where
create will return a NULL ODS if we would end up drawing nothing. So don't need
to do this check here

On 2014/10/06 14:29:04, bsalomon wrote:

+        fColorStages.reset();
+        this->removeFixedFunctionVertexAttribs(0x1 << kColor_GrVertexAttribBinding);
+        return;
+    }
+
     int firstColorStage = 0;
 
     // Set up color and flags for ConstantColorComponent checks