Move program descriptor and primitive processor off of optstate

src/gpu/gl/GrGLProgramDesc.h

Index: src/gpu/gl/GrGLProgramDesc.h
diff --git a/src/gpu/gl/GrGLProgramDesc.h b/src/gpu/gl/GrGLProgramDesc.h
index edf139e3a87c51d00a4643d1dbb342dafa1b29e5..3b8093d53d5abe3dc88a16a3877f47c6ace8b6c7 100644
--- a/src/gpu/gl/GrGLProgramDesc.h
+++ b/src/gpu/gl/GrGLProgramDesc.h
@@ -41,6 +41,7 @@ public:
     /**
      * Builds a GL specific program descriptor
      *
+     * @param GrPrimitiveProcessor The geometry
      * @param GrOptDrawState  The optimized drawstate.  The descriptor will represent a program
      *                        which this optstate can use to draw with.  The optstate contains
      *                        general draw information, as well as the specific color, geometry,
@@ -55,11 +56,13 @@ public:
      *                              supported
      * @param GrProgramDesc  The built and finalized descriptor
      **/
-    static bool Build(const GrOptDrawState&,
+    static bool Build(GrProgramDesc*,
+                      const GrPrimitiveProcessor&,
+                      const GrOptDrawState&,
                       const GrProgramDesc::DescInfo&,
                       GrGpu::DrawType,
-                      GrGLGpu*,
-                      GrProgramDesc*);
+                      const GrGLGpu*,
+                      const GrBatchTracker&);
 };
 
 #endif