Revert of Cleanup of shader building system

src/gpu/gl/GrGLProcessor.h

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrGLProcessor_DEFINED
 #define GrGLProcessor_DEFINED
 
 #include "GrBackendProcessorFactory.h"
-#include "GrGLProgramDataManager.h"
-#include "GrTextureAccess.h"
+#include "GrGLProgramEffects.h"
+#include "GrGLShaderVar.h"
+#include "GrGLSL.h"
 
 /** @file
     This file contains specializations for OpenGL of the shader stages declared in
     include/gpu/GrProcessor.h. Objects of type GrGLProcessor are responsible for emitting the
     GLSL code that implements a GrProcessor and for uploading uniforms at draw time. If they don't
     always emit the same GLSL code, they must have a function:
         static inline void GenKey(const GrProcessor&, const GrGLCaps&, GrProcessorKeyBuilder*)
     that is used to implement a program cache. When two GrProcessors produce the same key this means
     that their GrGLProcessors would emit the same GLSL code.
 
@@ skipping 95 matching lines @@
                           const char* outputColor,
                           const char* inputColor,
                           const TransformedCoordsArray& coords,
                           const TextureSamplerArray& samplers) = 0;
 
 private:
     typedef GrGLProcessor INHERITED;
 };
 
 #endif