Make GrGLSLProgramBuilder base class for ProgramBuilder

src/gpu/effects/GrConvexPolyEffect.cpp

Index: src/gpu/effects/GrConvexPolyEffect.cpp
diff --git a/src/gpu/effects/GrConvexPolyEffect.cpp b/src/gpu/effects/GrConvexPolyEffect.cpp
index b37964d6b81223fd4e0ddfe4790c792689be8593..714c68a9cef15c4611dab183a85f58bb19f0549b 100644
--- a/src/gpu/effects/GrConvexPolyEffect.cpp
+++ b/src/gpu/effects/GrConvexPolyEffect.cpp
@@ -212,11 +212,6 @@ void GrGLConvexPolyEffect::emitCode(EmitArgs& args) {
         fsBuilder->codeAppend("\t\talpha *= edge;\n");
     }
 
-    // Woe is me. See https://bug.skia.org/2149 .
-    if (kTegra2_GrGLRenderer == args.fBuilder->ctxInfo().renderer()) {
-        fsBuilder->codeAppend("\t\tif (-1.0 == alpha) {\n\t\t\tdiscard;\n\t\t}\n");
-    }
-
     if (GrProcessorEdgeTypeIsInverseFill(cpe.getEdgeType())) {
         fsBuilder->codeAppend("\talpha = 1.0 - alpha;\n");
     }