move program descriptor generation to flush

src/gpu/GrProgramDesc.h

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrProgramDesc_DEFINED
 #define GrProgramDesc_DEFINED
 
@@ skipping 85 matching lines @@
     };
 
     struct KeyHeader {
         uint8_t                     fDstReadKey;   // set by GrGLShaderBuilder if there
                                                    // are effects that must read the dst.
                                                    // Otherwise, 0.
         uint8_t                     fFragPosKey;   // set by GrGLShaderBuilder if there are
                                                    // effects that read the fragment position.
                                                    // Otherwise, 0.
 
-        SkBool8                     fEmitsPointSize;
-
         ColorInput                  fColorInput : 8;
         ColorInput                  fCoverageInput : 8;
 
         PrimaryOutputType           fPrimaryOutputType : 8;
         SecondaryOutputType         fSecondaryOutputType : 8;
 
         SkBool8                     fHasGeometryProcessor;
         int8_t                      fColorEffectCnt;
         int8_t                      fCoverageEffectCnt;
     };
@@ skipping 11 matching lines @@
         return this->header().fCoverageEffectCnt;
     }
 
     int numTotalEffects() const { return this->numColorEffects() + this->numCoverageEffects(); }
 
     // This should really only be used internally, base classes should return their own headers
     const KeyHeader& header() const { return *this->atOffset<KeyHeader, kHeaderOffset>(); }
 
     // A struct to communicate descriptor information to the program descriptor builder
     struct DescInfo {
+        bool operator==(const DescInfo& that) const {
+            return fHasVertexColor == that.fHasVertexColor &&
+                   fHasVertexCoverage == that.fHasVertexCoverage &&
+                   fInputColorIsUsed == that.fInputColorIsUsed &&
+                   fInputCoverageIsUsed == that.fInputCoverageIsUsed &&
+                   fReadsDst == that.fReadsDst &&
+                   fReadsFragPosition == that.fReadsFragPosition &&
+                   fRequiresLocalCoordAttrib == that.fRequiresLocalCoordAttrib &&
+                   fPrimaryOutputType == that.fPrimaryOutputType &&
+                   fSecondaryOutputType == that.fSecondaryOutputType;
+
+        }
+        bool operator!=(const DescInfo& that) const { return !(*this == that); };
         // TODO when GPs control uniform / attribute handling of color / coverage, then we can
         // clean this up
         bool            fHasVertexColor;
         bool            fHasVertexCoverage;
 
         // These flags are needed to protect the code from creating an unused uniform color/coverage
         // which will cause shader compiler errors.
         bool            fInputColorIsUsed;
         bool            fInputCoverageIsUsed;
 
@@ skipping 48 matching lines @@
         kPreAllocSize = kHeaderOffset + kHeaderSize +
                         kMaxPreallocProcessors * sizeof(uint32_t) * kIntsPerProcessor,
     };
 
     SkSTArray<kPreAllocSize, uint8_t, true> fKey;
 
     friend class GrGLProgramDescBuilder;
 };
 
 #endif