diff options
44 files changed, 84 insertions, 84 deletions
diff --git a/gm/dcshader.cpp b/gm/dcshader.cpp index ead779db4e..8120ff836a 100644 --- a/gm/dcshader.cpp +++ b/gm/dcshader.cpp @@ -71,7 +71,7 @@ public: const char* inputColor, const TransformedCoordsArray& coords, const TextureSamplerArray& samplers) { - GrGLFPFragmentBuilder* fpb = builder->getFragmentShaderBuilder(); + GrGLFragmentBuilder* fpb = builder->getFragmentShaderBuilder(); fpb->codeAppendf("vec2 c = %s;", fpb->ensureFSCoords2D(coords, 0).c_str()); fpb->codeAppend("vec2 r = mod(c, vec2(20.0));"); fpb->codeAppend("vec4 color = vec4(0.5*sin(c.x / 15.0) + 0.5," diff --git a/src/effects/SkAlphaThresholdFilter.cpp b/src/effects/SkAlphaThresholdFilter.cpp index 2d0fe3e861..b699498b3a 100644 --- a/src/effects/SkAlphaThresholdFilter.cpp +++ b/src/effects/SkAlphaThresholdFilter.cpp @@ -154,7 +154,7 @@ void GrGLAlphaThresholdEffect::emitCode(GrGLFPBuilder* builder, kFloat_GrSLType, kDefault_GrSLPrecision, "outer_threshold"); - GrGLFPFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); + GrGLFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); SkString coords2D = fsBuilder->ensureFSCoords2D(coords, 0); SkString maskCoords2D = fsBuilder->ensureFSCoords2D(coords, 1); diff --git a/src/effects/SkArithmeticMode_gpu.cpp b/src/effects/SkArithmeticMode_gpu.cpp index a51496aadf..bd87931eb4 100644 --- a/src/effects/SkArithmeticMode_gpu.cpp +++ b/src/effects/SkArithmeticMode_gpu.cpp @@ -20,7 +20,7 @@ static const bool gUseUnpremul = false; -static void add_arithmetic_code(GrGLFPFragmentBuilder* fsBuilder, +static void add_arithmetic_code(GrGLFragmentBuilder* fsBuilder, const char* inputColor, const char* dstColor, const char* outputColor, @@ -66,7 +66,7 @@ public: const char* inputColor, const TransformedCoordsArray& coords, const TextureSamplerArray& samplers) override { - GrGLFPFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); + GrGLFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); fsBuilder->codeAppend("vec4 bgColor = "); fsBuilder->appendTextureLookup(samplers[0], coords[0].c_str(), coords[0].getType()); fsBuilder->codeAppendf(";"); @@ -230,7 +230,7 @@ public: private: void onEmitCode(const EmitArgs& args) override { - GrGLFPFragmentBuilder* fsBuilder = args.fPB->getFragmentShaderBuilder(); + GrGLXPFragmentBuilder* fsBuilder = args.fPB->getFragmentShaderBuilder(); const char* dstColor = fsBuilder->dstColor(); diff --git a/src/effects/SkBlurMaskFilter.cpp b/src/effects/SkBlurMaskFilter.cpp index 1b940fbce3..41f0d8dc7f 100644 --- a/src/effects/SkBlurMaskFilter.cpp +++ b/src/effects/SkBlurMaskFilter.cpp @@ -678,7 +678,7 @@ private: typedef GrGLFragmentProcessor INHERITED; }; -void OutputRectBlurProfileLookup(GrGLFPFragmentBuilder* fsBuilder, +void OutputRectBlurProfileLookup(GrGLFragmentBuilder* fsBuilder, const GrGLShaderBuilder::TextureSampler& sampler, const char *output, const char *profileSize, const char *loc, @@ -715,7 +715,7 @@ void GrGLRectBlurEffect::emitCode(GrGLFPBuilder* builder, "profileSize", &profileSizeName); - GrGLFPFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); + GrGLFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); const char *fragmentPos = fsBuilder->fragmentPosition(); if (inputColor) { @@ -1060,7 +1060,7 @@ void GrGLRRectBlurEffect::emitCode(GrGLFPBuilder* builder, "blurRadius", &blurRadiusName); - GrGLFPFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); + GrGLFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); const char* fragmentPos = fsBuilder->fragmentPosition(); // warp the fragment position to the appropriate part of the 9patch blur texture diff --git a/src/effects/SkColorCubeFilter.cpp b/src/effects/SkColorCubeFilter.cpp index 49ce8401cb..3878e5fc19 100644 --- a/src/effects/SkColorCubeFilter.cpp +++ b/src/effects/SkColorCubeFilter.cpp @@ -295,7 +295,7 @@ void GrColorCubeEffect::GLProcessor::emitCode(GrGLFPBuilder* builder, // Note: if implemented using texture3D in OpenGL ES older than OpenGL ES 3.0, // the shader might need "#extension GL_OES_texture_3D : enable". - GrGLFPFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); + GrGLFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); // Unpremultiply color fsBuilder->codeAppendf("\tfloat %s = max(%s.a, 0.00001);\n", nonZeroAlpha, inputColor); diff --git a/src/effects/SkColorMatrixFilter.cpp b/src/effects/SkColorMatrixFilter.cpp index 1c9eef9978..58f074c9aa 100644 --- a/src/effects/SkColorMatrixFilter.cpp +++ b/src/effects/SkColorMatrixFilter.cpp @@ -444,7 +444,7 @@ public: // could optimize this case, but we aren't for now. inputColor = "vec4(1)"; } - GrGLFPFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); + GrGLFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); // The max() is to guard against 0 / 0 during unpremul when the incoming color is // transparent black. fsBuilder->codeAppendf("\tfloat nonZeroAlpha = max(%s.a, 0.00001);\n", inputColor); diff --git a/src/effects/SkDisplacementMapEffect.cpp b/src/effects/SkDisplacementMapEffect.cpp index b0fea9b883..a7fcbbe054 100644 --- a/src/effects/SkDisplacementMapEffect.cpp +++ b/src/effects/SkDisplacementMapEffect.cpp @@ -568,7 +568,7 @@ void GrGLDisplacementMapEffect::emitCode(GrGLFPBuilder* builder, // a number smaller than that to approximate 0, but // leave room for 32-bit float GPU rounding errors. - GrGLFPFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); + GrGLFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); fsBuilder->codeAppendf("\t\tvec4 %s = ", dColor); fsBuilder->appendTextureLookup(samplers[0], coords[0].c_str(), coords[0].getType()); fsBuilder->codeAppend(";\n"); diff --git a/src/effects/SkLightingImageFilter.cpp b/src/effects/SkLightingImageFilter.cpp index 39fb5e54ce..ed1e2d1f80 100644 --- a/src/effects/SkLightingImageFilter.cpp +++ b/src/effects/SkLightingImageFilter.cpp @@ -1641,7 +1641,7 @@ void GrGLLightingEffect::emitCode(GrGLFPBuilder* builder, GrGLShaderVar("scale", kFloat_GrSLType), }; SkString sobelFuncName; - GrGLFPFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); + GrGLFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); SkString coords2D = fsBuilder->ensureFSCoords2D(coords, 0); fsBuilder->emitFunction(kFloat_GrSLType, @@ -1906,7 +1906,7 @@ void GrGLPointLight::emitSurfaceToLight(GrGLFPBuilder* builder, const char* z) { fLocationUni = builder->addUniform(GrGLProgramBuilder::kFragment_Visibility, kVec3f_GrSLType, kDefault_GrSLPrecision, "LightLocation", &loc); - GrGLFPFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); + GrGLFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); fsBuilder->codeAppendf("normalize(%s - vec3(%s.xy, %s))", loc, fsBuilder->fragmentPosition(), z); } @@ -1932,7 +1932,7 @@ void GrGLSpotLight::emitSurfaceToLight(GrGLFPBuilder* builder, const char* z) { kVec3f_GrSLType, kDefault_GrSLPrecision, "LightLocation", &location); - GrGLFPFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); + GrGLFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); fsBuilder->codeAppendf("normalize(%s - vec3(%s.xy, %s))", location, fsBuilder->fragmentPosition(), z); } @@ -1976,7 +1976,7 @@ void GrGLSpotLight::emitLightColor(GrGLFPBuilder* builder, color, cosOuter, coneScale); lightColorBody.appendf("\t}\n"); lightColorBody.appendf("\treturn %s;\n", color); - GrGLFPFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); + GrGLFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); fsBuilder->emitFunction(kVec3f_GrSLType, "lightColor", SK_ARRAY_COUNT(gLightColorArgs), diff --git a/src/effects/SkLumaColorFilter.cpp b/src/effects/SkLumaColorFilter.cpp index 1ea136b634..00005417be 100644 --- a/src/effects/SkLumaColorFilter.cpp +++ b/src/effects/SkLumaColorFilter.cpp @@ -90,7 +90,7 @@ public: inputColor = "vec4(1)"; } - GrGLFPFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); + GrGLFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); fsBuilder->codeAppendf("\tfloat luma = dot(vec3(%f, %f, %f), %s.rgb);\n", SK_ITU_BT709_LUM_COEFF_R, SK_ITU_BT709_LUM_COEFF_G, diff --git a/src/effects/SkMagnifierImageFilter.cpp b/src/effects/SkMagnifierImageFilter.cpp index e39462f55b..48fad8ee79 100644 --- a/src/effects/SkMagnifierImageFilter.cpp +++ b/src/effects/SkMagnifierImageFilter.cpp @@ -151,7 +151,7 @@ void GrGLMagnifierEffect::emitCode(GrGLFPBuilder* builder, GrGLProgramBuilder::kVertex_Visibility, kVec4f_GrSLType, kDefault_GrSLPrecision, "Bounds"); - GrGLFPFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); + GrGLFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); SkString coords2D = fsBuilder->ensureFSCoords2D(coords, 0); fsBuilder->codeAppendf("\t\tvec2 coord = %s;\n", coords2D.c_str()); fsBuilder->codeAppendf("\t\tvec2 zoom_coord = %s + %s * %s;\n", diff --git a/src/effects/SkMorphologyImageFilter.cpp b/src/effects/SkMorphologyImageFilter.cpp index 9dff99f3a5..a681c9d059 100644 --- a/src/effects/SkMorphologyImageFilter.cpp +++ b/src/effects/SkMorphologyImageFilter.cpp @@ -391,7 +391,7 @@ void GrGLMorphologyEffect::emitCode(GrGLFPBuilder* builder, "Range"); const char* range = builder->getUniformCStr(fRangeUni); - GrGLFPFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); + GrGLFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); SkString coords2D = fsBuilder->ensureFSCoords2D(coords, 0); const char* func; switch (fType) { diff --git a/src/effects/SkPerlinNoiseShader.cpp b/src/effects/SkPerlinNoiseShader.cpp index a7c20174b8..7114703168 100644 --- a/src/effects/SkPerlinNoiseShader.cpp +++ b/src/effects/SkPerlinNoiseShader.cpp @@ -647,7 +647,7 @@ void GrGLPerlinNoise::emitCode(GrGLFPBuilder* builder, const TextureSamplerArray& samplers) { sk_ignore_unused_variable(inputColor); - GrGLFPFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); + GrGLFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); SkString vCoords = fsBuilder->ensureFSCoords2D(coords, 0); fBaseFrequencyUni = builder->addUniform(GrGLProgramBuilder::kFragment_Visibility, diff --git a/src/effects/SkTableColorFilter.cpp b/src/effects/SkTableColorFilter.cpp index 0cda2c2917..7298960a08 100644 --- a/src/effects/SkTableColorFilter.cpp +++ b/src/effects/SkTableColorFilter.cpp @@ -427,7 +427,7 @@ void GLColorTableEffect::emitCode(GrGLFPBuilder* builder, "yoffsets", &yoffsets); static const float kColorScaleFactor = 255.0f / 256.0f; static const float kColorOffsetFactor = 1.0f / 512.0f; - GrGLFPFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); + GrGLFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); if (NULL == inputColor) { // the input color is solid white (all ones). static const float kMaxValue = kColorScaleFactor + kColorOffsetFactor; diff --git a/src/effects/gradients/SkGradientShader.cpp b/src/effects/gradients/SkGradientShader.cpp index 0f6599dc9a..eaa7e46f76 100644 --- a/src/effects/gradients/SkGradientShader.cpp +++ b/src/effects/gradients/SkGradientShader.cpp @@ -1028,7 +1028,7 @@ void GrGLGradientEffect::emitColor(GrGLFPBuilder* builder, const char* outputColor, const char* inputColor, const TextureSamplerArray& samplers) { - GrGLFPFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); + GrGLFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); if (SkGradientShaderBase::kTwo_GpuColorType == ge.getColorType()){ fsBuilder->codeAppendf("\tvec4 colorTemp = mix(%s, %s, clamp(%s, 0.0, 1.0));\n", builder->getUniformVariable(fColorStartUni).c_str(), diff --git a/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp b/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp index 403951da59..bc70d6bca4 100644 --- a/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp +++ b/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp @@ -254,7 +254,7 @@ void GLEdge2PtConicalEffect::emitCode(GrGLFPBuilder* builder, SkASSERT(coords[0].getType() == coords[1].getType()); const char* coords2D; SkString bVar; - GrGLFPFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); + GrGLFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); if (kVec3f_GrSLType == coords[0].getType()) { fsBuilder->codeAppendf("\tvec3 interpolants = vec3(%s.xy / %s.z, %s.x / %s.z);\n", coords[0].c_str(), coords[0].c_str(), coords[1].c_str(), @@ -536,7 +536,7 @@ void GLFocalOutside2PtConicalEffect::emitCode(GrGLFPBuilder* builder, builder->getUniformVariable(fParamUni).appendArrayAccess(1, &p1); // if we have a vec3 from being in perspective, convert it to a vec2 first - GrGLFPFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); + GrGLFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); SkString coords2DString = fsBuilder->ensureFSCoords2D(coords, 0); const char* coords2D = coords2DString.c_str(); @@ -752,7 +752,7 @@ void GLFocalInside2PtConicalEffect::emitCode(GrGLFPBuilder* builder, GrGLShaderVar focal = builder->getUniformVariable(fFocalUni); // if we have a vec3 from being in perspective, convert it to a vec2 first - GrGLFPFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); + GrGLFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); SkString coords2DString = fsBuilder->ensureFSCoords2D(coords, 0); const char* coords2D = coords2DString.c_str(); @@ -1016,7 +1016,7 @@ void GLCircleInside2PtConicalEffect::emitCode(GrGLFPBuilder* builder, GrGLShaderVar params = builder->getUniformVariable(fParamUni); // if we have a vec3 from being in perspective, convert it to a vec2 first - GrGLFPFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); + GrGLFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); SkString coords2DString = fsBuilder->ensureFSCoords2D(coords, 0); const char* coords2D = coords2DString.c_str(); @@ -1262,7 +1262,7 @@ void GLCircleOutside2PtConicalEffect::emitCode(GrGLFPBuilder* builder, GrGLShaderVar params = builder->getUniformVariable(fParamUni); // if we have a vec3 from being in perspective, convert it to a vec2 first - GrGLFPFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); + GrGLFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); SkString coords2DString = fsBuilder->ensureFSCoords2D(coords, 0); const char* coords2D = coords2DString.c_str(); diff --git a/src/effects/gradients/SkTwoPointRadialGradient.cpp b/src/effects/gradients/SkTwoPointRadialGradient.cpp index 0146a77232..44b73d6a3e 100644 --- a/src/effects/gradients/SkTwoPointRadialGradient.cpp +++ b/src/effects/gradients/SkTwoPointRadialGradient.cpp @@ -589,7 +589,7 @@ void GrGLRadial2Gradient::emitCode(GrGLFPBuilder* builder, builder->getUniformVariable(fParamUni).appendArrayAccess(4, &p4); builder->getUniformVariable(fParamUni).appendArrayAccess(5, &p5); - GrGLFPFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); + GrGLFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); // We interpolate the linear component in coords[1]. SkASSERT(coords[0].getType() == coords[1].getType()); const char* coords2D; diff --git a/src/gpu/GrAAConvexPathRenderer.cpp b/src/gpu/GrAAConvexPathRenderer.cpp index 01241c4c8c..f031f7f61b 100644 --- a/src/gpu/GrAAConvexPathRenderer.cpp +++ b/src/gpu/GrAAConvexPathRenderer.cpp @@ -565,7 +565,7 @@ public: this->emitTransforms(args.fPB, gpArgs->fPositionVar, qe.inPosition()->fName, qe.localMatrix(), args.fTransformsIn, args.fTransformsOut); - GrGLGPFragmentBuilder* fsBuilder = args.fPB->getFragmentShaderBuilder(); + GrGLFragmentBuilder* fsBuilder = args.fPB->getFragmentShaderBuilder(); SkAssertResult(fsBuilder->enableFeature( GrGLFragmentShaderBuilder::kStandardDerivatives_GLSLFeature)); diff --git a/src/gpu/GrDefaultGeoProcFactory.cpp b/src/gpu/GrDefaultGeoProcFactory.cpp index ae1f4d15b0..0349af6480 100644 --- a/src/gpu/GrDefaultGeoProcFactory.cpp +++ b/src/gpu/GrDefaultGeoProcFactory.cpp @@ -86,7 +86,7 @@ public: const DefaultGeoProc& gp = args.fGP.cast<DefaultGeoProc>(); GrGLGPBuilder* pb = args.fPB; GrGLVertexBuilder* vsBuilder = pb->getVertexShaderBuilder(); - GrGLGPFragmentBuilder* fs = args.fPB->getFragmentShaderBuilder(); + GrGLFragmentBuilder* fs = args.fPB->getFragmentShaderBuilder(); const BatchTracker& local = args.fBT.cast<BatchTracker>(); // emit attributes diff --git a/src/gpu/GrOvalRenderer.cpp b/src/gpu/GrOvalRenderer.cpp index a1c80f5b8b..9a02a87157 100644 --- a/src/gpu/GrOvalRenderer.cpp +++ b/src/gpu/GrOvalRenderer.cpp @@ -113,7 +113,7 @@ public: this->emitTransforms(args.fPB, gpArgs->fPositionVar, ce.inPosition()->fName, ce.localMatrix(), args.fTransformsIn, args.fTransformsOut); - GrGLGPFragmentBuilder* fsBuilder = args.fPB->getFragmentShaderBuilder(); + GrGLFragmentBuilder* fsBuilder = args.fPB->getFragmentShaderBuilder(); fsBuilder->codeAppendf("float d = length(%s.xy);", v.fsIn()); fsBuilder->codeAppendf("float edgeAlpha = clamp(%s.z * (1.0 - d), 0.0, 1.0);", v.fsIn()); if (ce.isStroked()) { @@ -293,7 +293,7 @@ public: ee.localMatrix(), args.fTransformsIn, args.fTransformsOut); // for outer curve - GrGLGPFragmentBuilder* fsBuilder = args.fPB->getFragmentShaderBuilder(); + GrGLFragmentBuilder* fsBuilder = args.fPB->getFragmentShaderBuilder(); fsBuilder->codeAppendf("vec2 scaledOffset = %s*%s.xy;", ellipseOffsets.fsIn(), ellipseRadii.fsIn()); fsBuilder->codeAppend("float test = dot(scaledOffset, scaledOffset) - 1.0;"); @@ -493,7 +493,7 @@ public: this->emitTransforms(args.fPB, gpArgs->fPositionVar, ee.inPosition()->fName, ee.localMatrix(), args.fTransformsIn, args.fTransformsOut); - GrGLGPFragmentBuilder* fsBuilder = args.fPB->getFragmentShaderBuilder(); + GrGLFragmentBuilder* fsBuilder = args.fPB->getFragmentShaderBuilder(); SkAssertResult(fsBuilder->enableFeature( GrGLFragmentShaderBuilder::kStandardDerivatives_GLSLFeature)); // for outer curve diff --git a/src/gpu/effects/GrBezierEffect.cpp b/src/gpu/effects/GrBezierEffect.cpp index 6eeda90cdd..041cfd7e44 100644 --- a/src/gpu/effects/GrBezierEffect.cpp +++ b/src/gpu/effects/GrBezierEffect.cpp @@ -90,7 +90,7 @@ void GrGLConicEffect::onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) { this->emitTransforms(pb, gpArgs->fPositionVar, gp.inPosition()->fName, gp.localMatrix(), args.fTransformsIn, args.fTransformsOut); - GrGLGPFragmentBuilder* fsBuilder = args.fPB->getFragmentShaderBuilder(); + GrGLFragmentBuilder* fsBuilder = args.fPB->getFragmentShaderBuilder(); fsBuilder->codeAppend("float edgeAlpha;"); switch (fEdgeType) { @@ -325,7 +325,7 @@ void GrGLQuadEffect::onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) { this->emitTransforms(pb, gpArgs->fPositionVar, gp.inPosition()->fName, gp.localMatrix(), args.fTransformsIn, args.fTransformsOut); - GrGLGPFragmentBuilder* fsBuilder = args.fPB->getFragmentShaderBuilder(); + GrGLFragmentBuilder* fsBuilder = args.fPB->getFragmentShaderBuilder(); fsBuilder->codeAppendf("float edgeAlpha;"); switch (fEdgeType) { @@ -539,7 +539,7 @@ void GrGLCubicEffect::onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) { this->emitTransforms(args.fPB, gpArgs->fPositionVar, gp.inPosition()->fName, gp.localMatrix(), args.fTransformsIn, args.fTransformsOut); - GrGLGPFragmentBuilder* fsBuilder = args.fPB->getFragmentShaderBuilder(); + GrGLFragmentBuilder* fsBuilder = args.fPB->getFragmentShaderBuilder(); GrGLShaderVar edgeAlpha("edgeAlpha", kFloat_GrSLType, 0, kHigh_GrSLPrecision); GrGLShaderVar dklmdx("dklmdx", kVec3f_GrSLType, 0, kHigh_GrSLPrecision); diff --git a/src/gpu/effects/GrBicubicEffect.cpp b/src/gpu/effects/GrBicubicEffect.cpp index 7564467686..917697270e 100644 --- a/src/gpu/effects/GrBicubicEffect.cpp +++ b/src/gpu/effects/GrBicubicEffect.cpp @@ -79,7 +79,7 @@ void GrGLBicubicEffect::emitCode(GrGLFPBuilder* builder, GrGLShaderVar("c2", kVec4f_GrSLType), GrGLShaderVar("c3", kVec4f_GrSLType), }; - GrGLFPFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); + GrGLFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); SkString coords2D = fsBuilder->ensureFSCoords2D(coords, 0); fsBuilder->emitFunction(kVec4f_GrSLType, "cubicBlend", diff --git a/src/gpu/effects/GrBitmapTextGeoProc.cpp b/src/gpu/effects/GrBitmapTextGeoProc.cpp index 9834a7687a..fab7ec26f2 100644 --- a/src/gpu/effects/GrBitmapTextGeoProc.cpp +++ b/src/gpu/effects/GrBitmapTextGeoProc.cpp @@ -60,7 +60,7 @@ public: this->emitTransforms(args.fPB, gpArgs->fPositionVar, cte.inPosition()->fName, cte.localMatrix(), args.fTransformsIn, args.fTransformsOut); - GrGLGPFragmentBuilder* fsBuilder = pb->getFragmentShaderBuilder(); + GrGLFragmentBuilder* fsBuilder = pb->getFragmentShaderBuilder(); if (cte.maskFormat() == kARGB_GrMaskFormat) { fsBuilder->codeAppendf("%s = ", args.fOutputColor); fsBuilder->appendTextureLookupAndModulate(args.fOutputColor, diff --git a/src/gpu/effects/GrConfigConversionEffect.cpp b/src/gpu/effects/GrConfigConversionEffect.cpp index 6ee0c966aa..8cf9bb6fa6 100644 --- a/src/gpu/effects/GrConfigConversionEffect.cpp +++ b/src/gpu/effects/GrConfigConversionEffect.cpp @@ -33,7 +33,7 @@ public: SkString tmpDecl; tmpVar.appendDecl(builder->ctxInfo(), &tmpDecl); - GrGLFPFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); + GrGLFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); fsBuilder->codeAppendf("%s;", tmpDecl.c_str()); diff --git a/src/gpu/effects/GrConstColorProcessor.cpp b/src/gpu/effects/GrConstColorProcessor.cpp index c48fc55abc..ab703fdd90 100644 --- a/src/gpu/effects/GrConstColorProcessor.cpp +++ b/src/gpu/effects/GrConstColorProcessor.cpp @@ -20,7 +20,7 @@ public: const char* inputColor, const TransformedCoordsArray& coords, const TextureSamplerArray& samplers) override { - GrGLFPFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); + GrGLFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); const char* colorUni; fColorUniform = builder->addUniform(GrGLProgramBuilder::kFragment_Visibility, kVec4f_GrSLType, kMedium_GrSLPrecision, "constantColor", diff --git a/src/gpu/effects/GrConvexPolyEffect.cpp b/src/gpu/effects/GrConvexPolyEffect.cpp index 538800e436..2ad4ce04e5 100644 --- a/src/gpu/effects/GrConvexPolyEffect.cpp +++ b/src/gpu/effects/GrConvexPolyEffect.cpp @@ -122,7 +122,7 @@ void GLAARectEffect::emitCode(GrGLFPBuilder* builder, "rect", &rectName); - GrGLFPFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); + GrGLFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); const char* fragmentPos = fsBuilder->fragmentPosition(); if (GrProcessorEdgeTypeIsAA(aare.getEdgeType())) { // The amount of coverage removed in x and y by the edges is computed as a pair of negative @@ -216,7 +216,7 @@ void GrGLConvexPolyEffect::emitCode(GrGLFPBuilder* builder, "edges", cpe.getEdgeCount(), &edgeArrayName); - GrGLFPFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); + GrGLFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); fsBuilder->codeAppend("\t\tfloat alpha = 1.0;\n"); fsBuilder->codeAppend("\t\tfloat edge;\n"); const char* fragmentPos = fsBuilder->fragmentPosition(); diff --git a/src/gpu/effects/GrConvolutionEffect.cpp b/src/gpu/effects/GrConvolutionEffect.cpp index 336778e037..3d96a00e9d 100644 --- a/src/gpu/effects/GrConvolutionEffect.cpp +++ b/src/gpu/effects/GrConvolutionEffect.cpp @@ -69,7 +69,7 @@ void GrGLConvolutionEffect::emitCode(GrGLFPBuilder* builder, kFloat_GrSLType, kDefault_GrSLPrecision, "Kernel", this->width()); - GrGLFPFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); + GrGLFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); SkString coords2D = fsBuilder->ensureFSCoords2D(coords, 0); fsBuilder->codeAppendf("\t\t%s = vec4(0, 0, 0, 0);\n", outputColor); diff --git a/src/gpu/effects/GrCoverageSetOpXP.cpp b/src/gpu/effects/GrCoverageSetOpXP.cpp index 0c4818431a..69b9ea417e 100644 --- a/src/gpu/effects/GrCoverageSetOpXP.cpp +++ b/src/gpu/effects/GrCoverageSetOpXP.cpp @@ -74,7 +74,7 @@ public: private: void onEmitCode(const EmitArgs& args) override { const CoverageSetOpXP& xp = args.fXP.cast<CoverageSetOpXP>(); - GrGLFPFragmentBuilder* fsBuilder = args.fPB->getFragmentShaderBuilder(); + GrGLXPFragmentBuilder* fsBuilder = args.fPB->getFragmentShaderBuilder(); if (xp.invertCoverage()) { fsBuilder->codeAppendf("%s = 1.0 - %s;", args.fOutputPrimary, args.fInputCoverage); diff --git a/src/gpu/effects/GrCustomXfermode.cpp b/src/gpu/effects/GrCustomXfermode.cpp index 195511d6d1..2f8a970290 100644 --- a/src/gpu/effects/GrCustomXfermode.cpp +++ b/src/gpu/effects/GrCustomXfermode.cpp @@ -29,7 +29,7 @@ bool GrCustomXfermode::IsSupportedMode(SkXfermode::Mode mode) { // Static helpers /////////////////////////////////////////////////////////////////////////////// -static void hard_light(GrGLFPFragmentBuilder* fsBuilder, +static void hard_light(GrGLFragmentBuilder* fsBuilder, const char* final, const char* src, const char* dst) { @@ -50,7 +50,7 @@ static void hard_light(GrGLFPFragmentBuilder* fsBuilder, } // Does one component of color-dodge -static void color_dodge_component(GrGLFPFragmentBuilder* fsBuilder, +static void color_dodge_component(GrGLFragmentBuilder* fsBuilder, const char* final, const char* src, const char* dst, @@ -74,7 +74,7 @@ static void color_dodge_component(GrGLFPFragmentBuilder* fsBuilder, } // Does one component of color-burn -static void color_burn_component(GrGLFPFragmentBuilder* fsBuilder, +static void color_burn_component(GrGLFragmentBuilder* fsBuilder, const char* final, const char* src, const char* dst, @@ -95,7 +95,7 @@ static void color_burn_component(GrGLFPFragmentBuilder* fsBuilder, } // Does one component of soft-light. Caller should have already checked that dst alpha > 0. -static void soft_light_component_pos_dst_alpha(GrGLFPFragmentBuilder* fsBuilder, +static void soft_light_component_pos_dst_alpha(GrGLFragmentBuilder* fsBuilder, const char* final, const char* src, const char* dst, @@ -138,7 +138,7 @@ static void soft_light_component_pos_dst_alpha(GrGLFPFragmentBuilder* fsBuilder, // hue and saturation of the first color, the luminosity of the second color, and the input // alpha. It has this signature: // vec3 set_luminance(vec3 hueSatColor, float alpha, vec3 lumColor). -static void add_lum_function(GrGLFPFragmentBuilder* fsBuilder, SkString* setLumFunction) { +static void add_lum_function(GrGLFragmentBuilder* fsBuilder, SkString* setLumFunction) { // Emit a helper that gets the luminance of a color. SkString getFunction; GrGLShaderVar getLumArgs[] = { @@ -183,7 +183,7 @@ static void add_lum_function(GrGLFPFragmentBuilder* fsBuilder, SkString* setLumF // Adds a function that creates a color with the hue and luminosity of one input color and // the saturation of another color. It will have this signature: // float set_saturation(vec3 hueLumColor, vec3 satColor) -static void add_sat_function(GrGLFPFragmentBuilder* fsBuilder, SkString* setSatFunction) { +static void add_sat_function(GrGLFragmentBuilder* fsBuilder, SkString* setSatFunction) { // Emit a helper that gets the saturation of a color SkString getFunction; GrGLShaderVar getSatArgs[] = { GrGLShaderVar("color", kVec3f_GrSLType) }; @@ -256,7 +256,7 @@ static void add_sat_function(GrGLFPFragmentBuilder* fsBuilder, SkString* setSatF } static void emit_custom_xfermode_code(SkXfermode::Mode mode, - GrGLFPFragmentBuilder* fsBuilder, + GrGLFragmentBuilder* fsBuilder, const char* outputColor, const char* inputColor, const char* dstColor) { @@ -416,7 +416,7 @@ public: const TransformedCoordsArray& coords, const TextureSamplerArray& samplers) override { SkXfermode::Mode mode = fp.cast<GrCustomXferFP>().mode(); - GrGLFPFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); + GrGLFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); const char* dstColor = "bgColor"; fsBuilder->codeAppendf("vec4 %s = ", dstColor); fsBuilder->appendTextureLookup(samplers[0], coords[0].c_str(), coords[0].getType()); @@ -550,7 +550,7 @@ public: private: void onEmitCode(const EmitArgs& args) override { SkXfermode::Mode mode = args.fXP.cast<CustomXP>().mode(); - GrGLFPFragmentBuilder* fsBuilder = args.fPB->getFragmentShaderBuilder(); + GrGLXPFragmentBuilder* fsBuilder = args.fPB->getFragmentShaderBuilder(); const char* dstColor = fsBuilder->dstColor(); emit_custom_xfermode_code(mode, fsBuilder, args.fOutputPrimary, args.fInputColor, dstColor); diff --git a/src/gpu/effects/GrDashingEffect.cpp b/src/gpu/effects/GrDashingEffect.cpp index 40d52f3096..a284b272db 100644 --- a/src/gpu/effects/GrDashingEffect.cpp +++ b/src/gpu/effects/GrDashingEffect.cpp @@ -901,7 +901,7 @@ void GLDashingCircleEffect::onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) { args.fTransformsIn, args.fTransformsOut); // transforms all points so that we can compare them to our test circle - GrGLGPFragmentBuilder* fsBuilder = args.fPB->getFragmentShaderBuilder(); + GrGLFragmentBuilder* fsBuilder = args.fPB->getFragmentShaderBuilder(); fsBuilder->codeAppendf("float xShifted = %s.x - floor(%s.x / %s.z) * %s.z;", dashParams.fsIn(), dashParams.fsIn(), dashParams.fsIn(), dashParams.fsIn()); @@ -1144,7 +1144,7 @@ void GLDashingLineEffect::onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) { args.fTransformsIn, args.fTransformsOut); // transforms all points so that we can compare them to our test rect - GrGLGPFragmentBuilder* fsBuilder = args.fPB->getFragmentShaderBuilder(); + GrGLFragmentBuilder* fsBuilder = args.fPB->getFragmentShaderBuilder(); fsBuilder->codeAppendf("float xShifted = %s.x - floor(%s.x / %s.z) * %s.z;", inDashParams.fsIn(), inDashParams.fsIn(), inDashParams.fsIn(), inDashParams.fsIn()); diff --git a/src/gpu/effects/GrDisableColorXP.cpp b/src/gpu/effects/GrDisableColorXP.cpp index da84be1b1a..261100deb9 100644 --- a/src/gpu/effects/GrDisableColorXP.cpp +++ b/src/gpu/effects/GrDisableColorXP.cpp @@ -66,7 +66,7 @@ private: // This emit code should be empty. However, on the nexus 6 there is a driver bug where if // you do not give gl_FragColor a value, the gl context is lost and we end up drawing // nothing. So this fix just sets the gl_FragColor arbitrarily to 0. - GrGLFPFragmentBuilder* fsBuilder = args.fPB->getFragmentShaderBuilder(); + GrGLXPFragmentBuilder* fsBuilder = args.fPB->getFragmentShaderBuilder(); fsBuilder->codeAppendf("%s = vec4(0);", args.fOutputPrimary); } diff --git a/src/gpu/effects/GrDistanceFieldGeoProc.cpp b/src/gpu/effects/GrDistanceFieldGeoProc.cpp index 719ea50b55..64811a5a03 100755 --- a/src/gpu/effects/GrDistanceFieldGeoProc.cpp +++ b/src/gpu/effects/GrDistanceFieldGeoProc.cpp @@ -42,7 +42,7 @@ public: args.fGP.cast<GrDistanceFieldA8TextGeoProc>(); const DistanceFieldBatchTracker& local = args.fBT.cast<DistanceFieldBatchTracker>(); GrGLGPBuilder* pb = args.fPB; - GrGLGPFragmentBuilder* fsBuilder = args.fPB->getFragmentShaderBuilder(); + GrGLFragmentBuilder* fsBuilder = args.fPB->getFragmentShaderBuilder(); SkAssertResult(fsBuilder->enableFeature( GrGLFragmentShaderBuilder::kStandardDerivatives_GLSLFeature)); @@ -312,7 +312,7 @@ public: const DistanceFieldPathBatchTracker& local = args.fBT.cast<DistanceFieldPathBatchTracker>(); GrGLGPBuilder* pb = args.fPB; - GrGLGPFragmentBuilder* fsBuilder = args.fPB->getFragmentShaderBuilder(); + GrGLFragmentBuilder* fsBuilder = args.fPB->getFragmentShaderBuilder(); SkAssertResult(fsBuilder->enableFeature( GrGLFragmentShaderBuilder::kStandardDerivatives_GLSLFeature)); @@ -587,7 +587,7 @@ public: dfTexEffect.inTextureCoords()->fName); // add frag shader code - GrGLGPFragmentBuilder* fsBuilder = args.fPB->getFragmentShaderBuilder(); + GrGLFragmentBuilder* fsBuilder = args.fPB->getFragmentShaderBuilder(); SkAssertResult(fsBuilder->enableFeature( GrGLFragmentShaderBuilder::kStandardDerivatives_GLSLFeature)); diff --git a/src/gpu/effects/GrDitherEffect.cpp b/src/gpu/effects/GrDitherEffect.cpp index b692de8a06..85116aee28 100644 --- a/src/gpu/effects/GrDitherEffect.cpp +++ b/src/gpu/effects/GrDitherEffect.cpp @@ -87,7 +87,7 @@ void GLDitherEffect::emitCode(GrGLFPBuilder* builder, const char* inputColor, const TransformedCoordsArray&, const TextureSamplerArray& samplers) { - GrGLFPFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); + GrGLFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); // Generate a random number based on the fragment position. For this // random number generator, we use the "GLSL rand" function // that seems to be floating around on the internet. It works under diff --git a/src/gpu/effects/GrMatrixConvolutionEffect.cpp b/src/gpu/effects/GrMatrixConvolutionEffect.cpp index e9c45363d0..a705f2b043 100644 --- a/src/gpu/effects/GrMatrixConvolutionEffect.cpp +++ b/src/gpu/effects/GrMatrixConvolutionEffect.cpp @@ -74,7 +74,7 @@ void GrGLMatrixConvolutionEffect::emitCode(GrGLFPBuilder* builder, int kWidth = fKernelSize.width(); int kHeight = fKernelSize.height(); - GrGLFPFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); + GrGLFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); SkString coords2D = fsBuilder->ensureFSCoords2D(coords, 0); fsBuilder->codeAppend("vec4 sum = vec4(0, 0, 0, 0);"); fsBuilder->codeAppendf("vec2 coord = %s - %s * %s;", coords2D.c_str(), kernelOffset, diff --git a/src/gpu/effects/GrOvalEffect.cpp b/src/gpu/effects/GrOvalEffect.cpp index 69f63263d8..d387b67f83 100644 --- a/src/gpu/effects/GrOvalEffect.cpp +++ b/src/gpu/effects/GrOvalEffect.cpp @@ -135,7 +135,7 @@ void GLCircleEffect::emitCode(GrGLFPBuilder* builder, "circle", &circleName); - GrGLFPFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); + GrGLFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); const char* fragmentPos = fsBuilder->fragmentPosition(); SkASSERT(kHairlineAA_GrProcessorEdgeType != ce.getEdgeType()); @@ -317,7 +317,7 @@ void GLEllipseEffect::emitCode(GrGLFPBuilder* builder, "ellipse", &ellipseName); - GrGLFPFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); + GrGLFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); const char* fragmentPos = fsBuilder->fragmentPosition(); // d is the offset to the ellipse center diff --git a/src/gpu/effects/GrPorterDuffXferProcessor.cpp b/src/gpu/effects/GrPorterDuffXferProcessor.cpp index 2be2f4e57b..b2c81754a1 100644 --- a/src/gpu/effects/GrPorterDuffXferProcessor.cpp +++ b/src/gpu/effects/GrPorterDuffXferProcessor.cpp @@ -140,7 +140,7 @@ private: /////////////////////////////////////////////////////////////////////////////// -bool append_porterduff_term(GrGLFPFragmentBuilder* fsBuilder, GrBlendCoeff coeff, +bool append_porterduff_term(GrGLXPFragmentBuilder* fsBuilder, GrBlendCoeff coeff, const char* colorName, const char* srcColorName, const char* dstColorName, bool hasPrevious) { if (kZero_GrBlendCoeff == coeff) { @@ -204,7 +204,7 @@ public: private: void onEmitCode(const EmitArgs& args) override { const PorterDuffXferProcessor& xp = args.fXP.cast<PorterDuffXferProcessor>(); - GrGLFPFragmentBuilder* fsBuilder = args.fPB->getFragmentShaderBuilder(); + GrGLXPFragmentBuilder* fsBuilder = args.fPB->getFragmentShaderBuilder(); if (PorterDuffXferProcessor::kCustom_PrimaryOutputType != xp.primaryOutputType()) { SkASSERT(!xp.willReadDstColor()); switch(xp.secondaryOutputType()) { diff --git a/src/gpu/effects/GrRRectEffect.cpp b/src/gpu/effects/GrRRectEffect.cpp index 7b6595a88d..9954b63acf 100644 --- a/src/gpu/effects/GrRRectEffect.cpp +++ b/src/gpu/effects/GrRRectEffect.cpp @@ -176,7 +176,7 @@ void GLCircularRRectEffect::emitCode(GrGLFPBuilder* builder, "radiusPlusHalf", &radiusPlusHalfName); - GrGLFPFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); + GrGLFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); const char* fragmentPos = fsBuilder->fragmentPosition(); // At each quarter-circle corner we compute a vector that is the offset of the fragment position // from the circle center. The vector is pinned in x and y to be in the quarter-plane relevant @@ -525,7 +525,7 @@ void GLEllipticalRRectEffect::emitCode(GrGLFPBuilder* builder, "innerRect", &rectName); - GrGLFPFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); + GrGLFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); const char* fragmentPos = fsBuilder->fragmentPosition(); // At each quarter-ellipse corner we compute a vector that is the offset of the fragment pos // to the ellipse center. The vector is pinned in x and y to be in the quarter-plane relevant diff --git a/src/gpu/effects/GrSimpleTextureEffect.cpp b/src/gpu/effects/GrSimpleTextureEffect.cpp index 2fe6dfe1a4..e729b1b045 100644 --- a/src/gpu/effects/GrSimpleTextureEffect.cpp +++ b/src/gpu/effects/GrSimpleTextureEffect.cpp @@ -24,7 +24,7 @@ public: const char* inputColor, const TransformedCoordsArray& coords, const TextureSamplerArray& samplers) override { - GrGLFPFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); + GrGLFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); fsBuilder->codeAppendf("\t%s = ", outputColor); fsBuilder->appendTextureLookupAndModulate(inputColor, samplers[0], diff --git a/src/gpu/effects/GrTextureDomain.cpp b/src/gpu/effects/GrTextureDomain.cpp index 3c4f348283..bd189868e7 100644 --- a/src/gpu/effects/GrTextureDomain.cpp +++ b/src/gpu/effects/GrTextureDomain.cpp @@ -197,7 +197,7 @@ void GrGLTextureDomainEffect::emitCode(GrGLFPBuilder* builder, const GrTextureDomainEffect& textureDomainEffect = fp.cast<GrTextureDomainEffect>(); const GrTextureDomain& domain = textureDomainEffect.textureDomain(); - GrGLFPFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); + GrGLFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); SkString coords2D = fsBuilder->ensureFSCoords2D(coords, 0); fGLDomain.sampleTexture(fsBuilder, domain, outputColor, coords2D, samplers[0], inputColor); } diff --git a/src/gpu/effects/GrYUVtoRGBEffect.cpp b/src/gpu/effects/GrYUVtoRGBEffect.cpp index 0296cd76cd..60c39bf4a7 100644 --- a/src/gpu/effects/GrYUVtoRGBEffect.cpp +++ b/src/gpu/effects/GrYUVtoRGBEffect.cpp @@ -66,7 +66,7 @@ public: const char* inputColor, const TransformedCoordsArray& coords, const TextureSamplerArray& samplers) override { - GrGLFPFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); + GrGLFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); const char* yuvMatrix = NULL; fMatrixUni = builder->addUniform(GrGLProgramBuilder::kFragment_Visibility, diff --git a/src/gpu/gl/GrGLPathProcessor.cpp b/src/gpu/gl/GrGLPathProcessor.cpp index 96175913bc..9ce668298d 100644 --- a/src/gpu/gl/GrGLPathProcessor.cpp +++ b/src/gpu/gl/GrGLPathProcessor.cpp @@ -16,7 +16,7 @@ GrGLPathProcessor::GrGLPathProcessor(const GrPathProcessor&, const GrBatchTracke void GrGLPathProcessor::emitCode(EmitArgs& args) { GrGLGPBuilder* pb = args.fPB; - GrGLGPFragmentBuilder* fs = args.fPB->getFragmentShaderBuilder(); + GrGLFragmentBuilder* fs = args.fPB->getFragmentShaderBuilder(); const PathBatchTracker& local = args.fBT.cast<PathBatchTracker>(); // emit transforms diff --git a/src/gpu/gl/GrGLPrimitiveProcessor.cpp b/src/gpu/gl/GrGLPrimitiveProcessor.cpp index 2bb595af01..3213ffa8e2 100644 --- a/src/gpu/gl/GrGLPrimitiveProcessor.cpp +++ b/src/gpu/gl/GrGLPrimitiveProcessor.cpp @@ -37,7 +37,7 @@ GrGLPrimitiveProcessor::setupColorPassThrough(GrGLGPBuilder* pb, const char* outputName, const GrGeometryProcessor::Attribute* colorAttr, UniformHandle* colorUniform) { - GrGLGPFragmentBuilder* fs = pb->getFragmentShaderBuilder(); + GrGLFragmentBuilder* fs = pb->getFragmentShaderBuilder(); if (kUniform_GrGPInput == inputType) { SkASSERT(colorUniform); const char* stagedLocalVarName; diff --git a/src/gpu/gl/GrGLXferProcessor.cpp b/src/gpu/gl/GrGLXferProcessor.cpp index b7bf3019b5..c517381249 100644 --- a/src/gpu/gl/GrGLXferProcessor.cpp +++ b/src/gpu/gl/GrGLXferProcessor.cpp @@ -15,7 +15,7 @@ void GrGLXferProcessor::emitCode(const EmitArgs& args) { if (args.fXP.getDstCopyTexture()) { bool topDown = kTopLeft_GrSurfaceOrigin == args.fXP.getDstCopyTexture()->origin(); - GrGLFPFragmentBuilder* fsBuilder = args.fPB->getFragmentShaderBuilder(); + GrGLXPFragmentBuilder* fsBuilder = args.fPB->getFragmentShaderBuilder(); // We don't think any shaders actually output negative coverage, but just as a safety check // for floating point precision errors we compare with <= here diff --git a/src/gpu/gl/builders/GrGLFragmentShaderBuilder.h b/src/gpu/gl/builders/GrGLFragmentShaderBuilder.h index 3d99abcb96..7afc76c711 100644 --- a/src/gpu/gl/builders/GrGLFragmentShaderBuilder.h +++ b/src/gpu/gl/builders/GrGLFragmentShaderBuilder.h @@ -15,10 +15,10 @@ class GrGLVarying; /* * This base class encapsulates the functionality which the GP uses to build fragment shaders */ -class GrGLGPFragmentBuilder : public GrGLShaderBuilder { +class GrGLFragmentBuilder : public GrGLShaderBuilder { public: - GrGLGPFragmentBuilder(GrGLProgramBuilder* program) : INHERITED(program) {} - virtual ~GrGLGPFragmentBuilder() {} + GrGLFragmentBuilder(GrGLProgramBuilder* program) : INHERITED(program) {} + virtual ~GrGLFragmentBuilder() {} /** * Use of these features may require a GLSL extension to be enabled. Shaders may not compile * if code is added that uses one of these features without calling enableFeature() @@ -58,20 +58,20 @@ private: * this builder to create their shader. Because this is the only shader builder the FP sees, we * just call it FPShaderBuilder */ -class GrGLFPFragmentBuilder : public GrGLGPFragmentBuilder { +class GrGLXPFragmentBuilder : public GrGLFragmentBuilder { public: - GrGLFPFragmentBuilder(GrGLProgramBuilder* program) : INHERITED(program) {} + GrGLXPFragmentBuilder(GrGLProgramBuilder* program) : INHERITED(program) {} /** Returns the variable name that holds the color of the destination pixel. This may be NULL if no effect advertised that it will read the destination. */ virtual const char* dstColor() = 0; private: - typedef GrGLGPFragmentBuilder INHERITED; + typedef GrGLFragmentBuilder INHERITED; }; // TODO rename to Fragment Builder -class GrGLFragmentShaderBuilder : public GrGLFPFragmentBuilder { +class GrGLFragmentShaderBuilder : public GrGLXPFragmentBuilder { public: typedef uint8_t DstReadKey; typedef uint8_t FragPosKey; @@ -156,7 +156,7 @@ private: friend class GrGLProgramBuilder; - typedef GrGLFPFragmentBuilder INHERITED; + typedef GrGLXPFragmentBuilder INHERITED; }; #endif diff --git a/src/gpu/gl/builders/GrGLProgramBuilder.h b/src/gpu/gl/builders/GrGLProgramBuilder.h index 2e9ab863d2..e7520eee10 100644 --- a/src/gpu/gl/builders/GrGLProgramBuilder.h +++ b/src/gpu/gl/builders/GrGLProgramBuilder.h @@ -155,7 +155,7 @@ public: const char* output) = 0; // TODO rename getFragmentBuilder - virtual GrGLGPFragmentBuilder* getFragmentShaderBuilder() = 0; + virtual GrGLFragmentBuilder* getFragmentShaderBuilder() = 0; virtual GrGLVertexBuilder* getVertexShaderBuilder() = 0; /* @@ -166,7 +166,7 @@ public: /* a specializations for FPs. Lets the user add uniforms and FS code */ class GrGLFPBuilder : public virtual GrGLUniformBuilder { public: - virtual GrGLFPFragmentBuilder* getFragmentShaderBuilder() = 0; + virtual GrGLFragmentBuilder* getFragmentShaderBuilder() = 0; /* * *NOTE* NO MEMBERS ALLOWED, MULTIPLE INHERITANCE @@ -176,7 +176,7 @@ public: /* a specializations for XPs. Lets the user add uniforms and FS code */ class GrGLXPBuilder : public virtual GrGLUniformBuilder { public: - virtual GrGLFPFragmentBuilder* getFragmentShaderBuilder() = 0; + virtual GrGLXPFragmentBuilder* getFragmentShaderBuilder() = 0; /* * *NOTE* NO MEMBERS ALLOWED, MULTIPLE INHERITANCE @@ -248,7 +248,7 @@ public: GrGLGpu* gpu() const override { return fGpu; } - GrGLFPFragmentBuilder* getFragmentShaderBuilder() override { return &fFS; } + GrGLXPFragmentBuilder* getFragmentShaderBuilder() override { return &fFS; } GrGLVertexBuilder* getVertexShaderBuilder() override { return &fVS; } void addVarying( |