Revert of Opt state takes a GP instead of a GeometryStage

tests/GLProgramsTest.cpp

Index: tests/GLProgramsTest.cpp
diff --git a/tests/GLProgramsTest.cpp b/tests/GLProgramsTest.cpp
index 75032bdbe6a168b8b0a3daba063b0c9794823711..5ab35b7d227b9314d80fcd14e9c06e6a481cde8a 100644
--- a/tests/GLProgramsTest.cpp
+++ b/tests/GLProgramsTest.cpp
@@ -456,6 +456,9 @@
             ds->reset();
             continue;
         }
+        const GrGeometryStage*                     geometryProcessor = NULL;
+        SkSTArray<8, const GrFragmentStage*, true> colorStages;
+        SkSTArray<8, const GrFragmentStage*, true> coverageStages;
         GrGLProgramDesc desc;
         GrDeviceCoordTexture dstCopy;
 
@@ -465,14 +468,24 @@
         }
         if (!GrGLProgramDesc::Build(*ods,
                                     drawType,
+                                    ods->getSrcBlendCoeff(),
+                                    ods->getDstBlendCoeff(),
                                     this,
                                     dstCopy.texture() ? &dstCopy : NULL,
+                                    &geometryProcessor,
+                                    &colorStages,
+                                    &coverageStages,
                                     &desc)) {
             SkDebugf("Failed to generate GL program descriptor");
             return false;
         }
-        SkAutoTUnref<GrGLProgram> program(
-                GrGLProgramBuilder::CreateProgram(*ods, desc, drawType, this));
+        SkAutoTUnref<GrGLProgram> program(GrGLProgramBuilder::CreateProgram(*ods,
+                                                                            desc,
+                                                                            drawType,
+                                                                            geometryProcessor,
+                                                                            colorStages.begin(),
+                                                                            coverageStages.begin(),
+                                                                            this));
         if (NULL == program.get()) {
             SkDebugf("Failed to create program!");
             return false;