Move program descriptor and primitive processor off of optstate

src/gpu/gl/GrGLProgramDesc.h

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrGLProgramDesc_DEFINED
 #define GrGLProgramDesc_DEFINED
 
@@ skipping 23 matching lines @@
         kHeaderSize = SkAlign4(sizeof(KeyHeader)),
         // Part 4.
         // This is the offset into the backenend specific part of the key, which includes
         // per-processor keys.
         kProcessorKeysOffset = kHeaderOffset + kHeaderSize,
     };
 
     /**
      * 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,
      *                        and coverage stages which will be used to generate the GL Program for
      *                        this optstate.
      * @param DescInfo  A descriptor info struct, generated by the optstate, which contains a number
      *                  of important facts about the program the built descriptor will represent
      * @param DrawType
      * @param GrGLGpu  A GL Gpu, the caps and Gpu object are used to output processor specific
      *                 parts of the descriptor.
      * @param GrDeviceCoordTexture  A dstCopy texture, which may be null if frame buffer fetch is
      *                              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