Revert of Cleanup of shader building system

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 "gl/builders/GrGLFragmentShaderBuilder.h"
+#include "gl/builders/GrGLProgramBuilder.h"
 #include "GrGLProgramDesc.h"
 #include "GrBackendProcessorFactory.h"
 #include "GrProcessor.h"
 #include "GrGpuGL.h"
 #include "GrOptDrawState.h"
 
 #include "SkChecksum.h"
 
 /**
  * The key for an individual coord transform is made up of a matrix type and a bit that
@@ skipping 152 matching lines @@
     size_t size = b->size();
     if (size > SK_MaxU16) {
         *processorKeySize = 0; // suppresses a warning.
         return false;
     }
     *processorKeySize = SkToU16(size);
     uint32_t* key = get_processor_meta_key(stage, useExplicitLocalCoords, caps, b);
     if (NULL == key) {
         return false;
     }
-    uint32_t attribKey = gen_attrib_key(stage.getProcessor());
+    uint32_t attribKey = gen_attrib_key(stage.getGeometryProcessor());
 
     // Currently we allow 16 bits for each of the above portions of the meta-key. Fail if they
     // don't fit.
     static const uint32_t kMetaKeyInvalidMask = ~((uint32_t) SK_MaxU16);
     if ((attribKey) & kMetaKeyInvalidMask) {
        return false;
     }
 
     key[1] |= attribKey;
     return true;
@@ skipping 149 matching lines @@
         SkASSERT(!header->fUseFragShaderOnly);
     }
 
     if (optState.readsDst()) {
         SkASSERT(dstCopy || gpu->caps()->dstReadInShaderSupport());
         const GrTexture* dstCopyTexture = NULL;
         if (dstCopy) {
             dstCopyTexture = dstCopy->texture();
         }
         header->fDstReadKey = GrGLFragmentShaderBuilder::KeyForDstRead(dstCopyTexture,
-                                                                       gpu->glCaps());
+                gpu->glCaps());
         SkASSERT(0 != header->fDstReadKey);
     } else {
         header->fDstReadKey = 0;
     }
 
     if (optState.readsFragPosition()) {
-        header->fFragPosKey =
-                GrGLFragmentShaderBuilder::KeyForFragmentPosition(optState.getRenderTarget(),
-                                                                  gpu->glCaps());
+        header->fFragPosKey = GrGLFragmentShaderBuilder::KeyForFragmentPosition(
+                optState.getRenderTarget(), gpu->glCaps());
     } else {
         header->fFragPosKey = 0;
     }
 
     // Record attribute indices
     header->fPositionAttributeIndex = optState.positionAttributeIndex();
     header->fLocalCoordAttributeIndex = optState.localCoordAttributeIndex();
 
     // For constant color and coverage we need an attribute with an index beyond those already set
     int availableAttributeIndex = optState.getVertexAttribCount();
@@ skipping 42 matching lines @@
     *checksum = 0;
     *checksum = SkChecksum::Compute(reinterpret_cast<uint32_t*>(fKey.begin()), keyLength);
 }
 
 GrGLProgramDesc& GrGLProgramDesc::operator= (const GrGLProgramDesc& other) {
     size_t keyLength = other.keyLength();
     fKey.reset(keyLength);
     memcpy(fKey.begin(), other.fKey.begin(), keyLength);
     return *this;
 }