Add GrEllipseEdgeEffect

src/gpu/gl/GrGLSL.h

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrGLSL_DEFINED
 #define GrGLSL_DEFINED
 
 #include "gl/GrGLInterface.h"
+#include "GrTypesPriv.h"
 
 class GrGLShaderVar;
 class SkString;
 
 // Limited set of GLSL versions we build shaders for. Caller should round
 // down the GLSL version to one of these enums.
 enum GrGLSLGeneration {
     /**
      * Desktop GLSL 1.10 and ES2 shading language (based on desktop GLSL 1.20)
      */
     k110_GrGLSLGeneration,
     /**
      * Desktop GLSL 1.30
      */
     k130_GrGLSLGeneration,
     /**
      * Desktop GLSL 1.40
      */
     k140_GrGLSLGeneration,
     /**
      * Desktop GLSL 1.50
      */
     k150_GrGLSLGeneration,
 };
 
-/**
- * Types of shader-language-specific boxed variables we can create.
- * (Currently only GrGLShaderVars, but should be applicable to other shader
- * languages.)
- */
-enum GrSLType {
-    kVoid_GrSLType,
-    kFloat_GrSLType,
-    kVec2f_GrSLType,
-    kVec3f_GrSLType,
-    kVec4f_GrSLType,
-    kMat33f_GrSLType,
-    kMat44f_GrSLType,
-    kSampler2D_GrSLType
-};
-
 enum GrSLConstantVec {
     kZeros_GrSLConstantVec,
     kOnes_GrSLConstantVec,
     kNone_GrSLConstantVec,
 };
 
 namespace {
 static inline int GrSLTypeToVecLength(GrSLType type) {
     static const int kVecLengths[] = {
         0, // kVoid_GrSLType
@@ skipping 108 matching lines @@
   * by in0 or in1 will not be emitted. The return value indicates whether a zeros vec was appended
   * or not.
   */
 GrSLConstantVec GrGLSLAdd4f(SkString* outAppend,
                             const char* in0,
                             const char* in1,
                             GrSLConstantVec default0 = kZeros_GrSLConstantVec,
                             GrSLConstantVec default1 = kZeros_GrSLConstantVec);
 
 #endif