remove separate color from coverage

src/gpu/gl/GrGLProgramDesc.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "GrGLProgramDesc.h"
 
 #include "GrGLProcessor.h"
 #include "GrBackendProcessorFactory.h"
@@ skipping 157 matching lines @@
                                 GrProcessorKeyBuilder* b,
                                 uint16_t* keySize) {
         /* 0 because no attribs on a fP */
         return get_meta_key(*fps.getProcessor(), caps, gen_transform_key(fps, useLocalCoords), 0,
                             b, keySize);
     }
 };
 
 
 template <class ProcessorKeyBuilder>
-bool
-GrGLProgramDescBuilder::BuildStagedProcessorKey(const typename ProcessorKeyBuilder::StagedProcessor& stage,
-                                         const GrGLCaps& caps,
-                                         bool requiresLocalCoordAttrib,
-                                         GrProgramDesc* desc,
-                                         int* offsetAndSizeIndex) {
+bool GrGLProgramDescBuilder::BuildStagedProcessorKey(
+        const typename ProcessorKeyBuilder::StagedProcessor& stage,
+        const GrGLCaps& caps,
+        bool requiresLocalCoordAttrib,
+        GrProgramDesc* desc,
+        int* offsetAndSizeIndex) {
     GrProcessorKeyBuilder b(&desc->fKey);
     uint16_t processorKeySize;
     uint32_t processorOffset = desc->fKey.count();
     if (processorOffset > SK_MaxU16 ||
             !ProcessorKeyBuilder::GetProcessorKey(stage, caps, requiresLocalCoordAttrib, &b,
                                                   &processorKeySize)){
         desc->fKey.reset();
         return false;
     }
 
     uint16_t* offsetAndSize =
             reinterpret_cast<uint16_t*>(desc->fKey.begin() + kProcessorKeyOffsetsAndLengthOffset +
                                         *offsetAndSizeIndex * 2 * sizeof(uint16_t));
     offsetAndSize[0] = SkToU16(processorOffset);
     offsetAndSize[1] = processorKeySize;
     ++(*offsetAndSizeIndex);
     return true;
 }
 
 bool GrGLProgramDescBuilder::Build(const GrOptDrawState& optState,
-                            const GrProgramDesc::DescInfo& descInfo,
-                            GrGpu::DrawType drawType,
-                            GrGpuGL* gpu,
-                            const GrDeviceCoordTexture* dstCopy,
-                            GrProgramDesc* desc) {
+                                   const GrProgramDesc::DescInfo& descInfo,
+                                   GrGpu::DrawType drawType,
+                                   GrGpuGL* gpu,
+                                   const GrDeviceCoordTexture* dstCopy,
+                                   GrProgramDesc* desc) {
     bool inputColorIsUsed = descInfo.fInputColorIsUsed;
     bool inputCoverageIsUsed = descInfo.fInputCoverageIsUsed;
 
     // The descriptor is used as a cache key. Thus when a field of the
     // descriptor will not affect program generation (because of the attribute
     // bindings in use or other descriptor field settings) it should be set
     // to a canonical value to avoid duplicate programs with different keys.
 
     bool requiresLocalCoordAttrib = descInfo.fRequiresLocalCoordAttrib;
 
@@ skipping 121 matching lines @@
     }
 
     header->fPrimaryOutputType = descInfo.fPrimaryOutputType;
     header->fSecondaryOutputType = descInfo.fSecondaryOutputType;
 
     header->fColorEffectCnt = optState.numColorStages();
     header->fCoverageEffectCnt = optState.numCoverageStages();
     desc->finalize();
     return true;
 }