diff options
Diffstat (limited to 'src/gpu/effects')
-rw-r--r-- | src/gpu/effects/GrBezierEffect.cpp | 26 | ||||
-rw-r--r-- | src/gpu/effects/GrCustomCoordsTextureEffect.cpp | 8 | ||||
-rw-r--r-- | src/gpu/effects/GrDashingEffect.cpp | 18 | ||||
-rwxr-xr-x | src/gpu/effects/GrDistanceFieldTextureEffect.cpp | 20 |
4 files changed, 36 insertions, 36 deletions
diff --git a/src/gpu/effects/GrBezierEffect.cpp b/src/gpu/effects/GrBezierEffect.cpp index fe509b60a4..d6044cb34a 100644 --- a/src/gpu/effects/GrBezierEffect.cpp +++ b/src/gpu/effects/GrBezierEffect.cpp @@ -7,7 +7,7 @@ #include "GrBezierEffect.h" -#include "gl/builders/GrGLFullProgramBuilder.h" +#include "gl/builders/GrGLProgramBuilder.h" #include "gl/GrGLProcessor.h" #include "gl/GrGLSL.h" #include "gl/GrGLGeometryProcessor.h" @@ -17,7 +17,7 @@ class GrGLConicEffect : public GrGLGeometryProcessor { public: GrGLConicEffect(const GrBackendProcessorFactory&, const GrProcessor&); - virtual void emitCode(GrGLFullProgramBuilder* builder, + virtual void emitCode(GrGLGPBuilder* builder, const GrGeometryProcessor& geometryProcessor, const GrProcessorKey& key, const char* outputColor, @@ -42,7 +42,7 @@ GrGLConicEffect::GrGLConicEffect(const GrBackendProcessorFactory& factory, fEdgeType = ce.getEdgeType(); } -void GrGLConicEffect::emitCode(GrGLFullProgramBuilder* builder, +void GrGLConicEffect::emitCode(GrGLGPBuilder* builder, const GrGeometryProcessor& geometryProcessor, const GrProcessorKey& key, const char* outputColor, @@ -55,10 +55,10 @@ void GrGLConicEffect::emitCode(GrGLFullProgramBuilder* builder, &vsName, &fsName); const GrShaderVar& inConicCoeffs = geometryProcessor.cast<GrConicEffect>().inConicCoeffs(); - GrGLVertexShaderBuilder* vsBuilder = builder->getVertexShaderBuilder(); + GrGLVertexBuilder* vsBuilder = builder->getVertexShaderBuilder(); vsBuilder->codeAppendf("%s = %s;", vsName, inConicCoeffs.c_str()); - GrGLProcessorFragmentShaderBuilder* fsBuilder = builder->getFragmentShaderBuilder(); + GrGLGPFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); fsBuilder->codeAppend("float edgeAlpha;"); switch (fEdgeType) { @@ -171,7 +171,7 @@ class GrGLQuadEffect : public GrGLGeometryProcessor { public: GrGLQuadEffect(const GrBackendProcessorFactory&, const GrProcessor&); - virtual void emitCode(GrGLFullProgramBuilder* builder, + virtual void emitCode(GrGLGPBuilder* builder, const GrGeometryProcessor& geometryProcessor, const GrProcessorKey& key, const char* outputColor, @@ -196,7 +196,7 @@ GrGLQuadEffect::GrGLQuadEffect(const GrBackendProcessorFactory& factory, fEdgeType = ce.getEdgeType(); } -void GrGLQuadEffect::emitCode(GrGLFullProgramBuilder* builder, +void GrGLQuadEffect::emitCode(GrGLGPBuilder* builder, const GrGeometryProcessor& geometryProcessor, const GrProcessorKey& key, const char* outputColor, @@ -206,11 +206,11 @@ void GrGLQuadEffect::emitCode(GrGLFullProgramBuilder* builder, const char *vsName, *fsName; builder->addVarying(kVec4f_GrSLType, "HairQuadEdge", &vsName, &fsName); - GrGLVertexShaderBuilder* vsBuilder = builder->getVertexShaderBuilder(); + GrGLVertexBuilder* vsBuilder = builder->getVertexShaderBuilder(); const GrShaderVar& inHairQuadEdge = geometryProcessor.cast<GrQuadEffect>().inHairQuadEdge(); vsBuilder->codeAppendf("%s = %s;", vsName, inHairQuadEdge.c_str()); - GrGLProcessorFragmentShaderBuilder* fsBuilder = builder->getFragmentShaderBuilder(); + GrGLGPFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); fsBuilder->codeAppendf("float edgeAlpha;"); switch (fEdgeType) { @@ -309,7 +309,7 @@ class GrGLCubicEffect : public GrGLGeometryProcessor { public: GrGLCubicEffect(const GrBackendProcessorFactory&, const GrProcessor&); - virtual void emitCode(GrGLFullProgramBuilder* builder, + virtual void emitCode(GrGLGPBuilder* builder, const GrGeometryProcessor& geometryProcessor, const GrProcessorKey& key, const char* outputColor, @@ -334,7 +334,7 @@ GrGLCubicEffect::GrGLCubicEffect(const GrBackendProcessorFactory& factory, fEdgeType = ce.getEdgeType(); } -void GrGLCubicEffect::emitCode(GrGLFullProgramBuilder* builder, +void GrGLCubicEffect::emitCode(GrGLGPBuilder* builder, const GrGeometryProcessor& geometryProcessor, const GrProcessorKey& key, const char* outputColor, @@ -346,11 +346,11 @@ void GrGLCubicEffect::emitCode(GrGLFullProgramBuilder* builder, builder->addVarying(kVec4f_GrSLType, "CubicCoeffs", &vsName, &fsName, GrGLShaderVar::kHigh_Precision); - GrGLVertexShaderBuilder* vsBuilder = builder->getVertexShaderBuilder(); + GrGLVertexBuilder* vsBuilder = builder->getVertexShaderBuilder(); const GrShaderVar& inCubicCoeffs = geometryProcessor.cast<GrCubicEffect>().inCubicCoeffs(); vsBuilder->codeAppendf("%s = %s;", vsName, inCubicCoeffs.c_str()); - GrGLProcessorFragmentShaderBuilder* fsBuilder = builder->getFragmentShaderBuilder(); + GrGLGPFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); GrGLShaderVar edgeAlpha("edgeAlpha", kFloat_GrSLType, 0, GrGLShaderVar::kHigh_Precision); GrGLShaderVar dklmdx("dklmdx", kVec3f_GrSLType, 0, GrGLShaderVar::kHigh_Precision); diff --git a/src/gpu/effects/GrCustomCoordsTextureEffect.cpp b/src/gpu/effects/GrCustomCoordsTextureEffect.cpp index 7362ba98a6..e89e46cb5a 100644 --- a/src/gpu/effects/GrCustomCoordsTextureEffect.cpp +++ b/src/gpu/effects/GrCustomCoordsTextureEffect.cpp @@ -6,7 +6,7 @@ */ #include "GrCustomCoordsTextureEffect.h" -#include "gl/builders/GrGLFullProgramBuilder.h" +#include "gl/builders/GrGLProgramBuilder.h" #include "gl/GrGLProcessor.h" #include "gl/GrGLSL.h" #include "gl/GrGLTexture.h" @@ -19,7 +19,7 @@ public: GrGLCustomCoordsTextureEffect(const GrBackendProcessorFactory& factory, const GrProcessor&) : INHERITED (factory) {} - virtual void emitCode(GrGLFullProgramBuilder* builder, + virtual void emitCode(GrGLGPBuilder* builder, const GrGeometryProcessor& geometryProcessor, const GrProcessorKey& key, const char* outputColor, @@ -36,11 +36,11 @@ public: builder->addVarying(kVec2f_GrSLType, "textureCoords", &vsVaryingName, &fsVaryingNamePtr); fsCoordName = fsVaryingNamePtr; - GrGLVertexShaderBuilder* vsBuilder = builder->getVertexShaderBuilder(); + GrGLVertexBuilder* vsBuilder = builder->getVertexShaderBuilder(); const GrShaderVar& inTextureCoords = customCoordsTextureEffect.inTextureCoords(); vsBuilder->codeAppendf("\t%s = %s;\n", vsVaryingName, inTextureCoords.c_str()); - GrGLProcessorFragmentShaderBuilder* fsBuilder = builder->getFragmentShaderBuilder(); + GrGLGPFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); fsBuilder->codeAppendf("\t%s = ", outputColor); fsBuilder->appendTextureLookupAndModulate(inputColor, samplers[0], diff --git a/src/gpu/effects/GrDashingEffect.cpp b/src/gpu/effects/GrDashingEffect.cpp index 4df1f02558..d7a2f402da 100644 --- a/src/gpu/effects/GrDashingEffect.cpp +++ b/src/gpu/effects/GrDashingEffect.cpp @@ -10,7 +10,7 @@ #include "../GrAARectRenderer.h" #include "GrGeometryProcessor.h" -#include "gl/builders/GrGLFullProgramBuilder.h" +#include "gl/builders/GrGLProgramBuilder.h" #include "gl/GrGLProcessor.h" #include "gl/GrGLGeometryProcessor.h" #include "gl/GrGLSL.h" @@ -482,7 +482,7 @@ class GLDashingCircleEffect : public GrGLGeometryProcessor { public: GLDashingCircleEffect(const GrBackendProcessorFactory&, const GrProcessor&); - virtual void emitCode(GrGLFullProgramBuilder* builder, + virtual void emitCode(GrGLGPBuilder* builder, const GrGeometryProcessor& geometryProcessor, const GrProcessorKey& key, const char* outputColor, @@ -510,7 +510,7 @@ GLDashingCircleEffect::GLDashingCircleEffect(const GrBackendProcessorFactory& fa fPrevIntervalLength = SK_ScalarMax; } -void GLDashingCircleEffect::emitCode(GrGLFullProgramBuilder* builder, +void GLDashingCircleEffect::emitCode(GrGLGPBuilder* builder, const GrGeometryProcessor& geometryProcessor, const GrProcessorKey& key, const char* outputColor, @@ -529,11 +529,11 @@ void GLDashingCircleEffect::emitCode(GrGLFullProgramBuilder* builder, const char *vsCoordName, *fsCoordName; builder->addVarying(kVec2f_GrSLType, "Coord", &vsCoordName, &fsCoordName); - GrGLVertexShaderBuilder* vsBuilder = builder->getVertexShaderBuilder(); + GrGLVertexBuilder* vsBuilder = builder->getVertexShaderBuilder(); vsBuilder->codeAppendf("\t%s = %s;\n", vsCoordName, dce.inCoord().c_str()); // transforms all points so that we can compare them to our test circle - GrGLProcessorFragmentShaderBuilder* fsBuilder = builder->getFragmentShaderBuilder(); + GrGLGPFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); fsBuilder->codeAppendf("\t\tfloat xShifted = %s.x - floor(%s.x / %s.z) * %s.z;\n", fsCoordName, fsCoordName, paramName, paramName); fsBuilder->codeAppendf("\t\tvec2 fragPosShifted = vec2(xShifted, %s.y);\n", fsCoordName); @@ -694,7 +694,7 @@ class GLDashingLineEffect : public GrGLGeometryProcessor { public: GLDashingLineEffect(const GrBackendProcessorFactory&, const GrProcessor&); - virtual void emitCode(GrGLFullProgramBuilder* builder, + virtual void emitCode(GrGLGPBuilder* builder, const GrGeometryProcessor& geometryProcessor, const GrProcessorKey& key, const char* outputColor, @@ -721,7 +721,7 @@ GLDashingLineEffect::GLDashingLineEffect(const GrBackendProcessorFactory& factor fPrevIntervalLength = SK_ScalarMax; } -void GLDashingLineEffect::emitCode(GrGLFullProgramBuilder* builder, +void GLDashingLineEffect::emitCode(GrGLGPBuilder* builder, const GrGeometryProcessor& geometryProcessor, const GrProcessorKey& key, const char* outputColor, @@ -745,11 +745,11 @@ void GLDashingLineEffect::emitCode(GrGLFullProgramBuilder* builder, const char *vsCoordName, *fsCoordName; builder->addVarying(kVec2f_GrSLType, "Coord", &vsCoordName, &fsCoordName); - GrGLVertexShaderBuilder* vsBuilder = builder->getVertexShaderBuilder(); + GrGLVertexBuilder* vsBuilder = builder->getVertexShaderBuilder(); vsBuilder->codeAppendf("\t%s = %s;\n", vsCoordName, de.inCoord().c_str()); // transforms all points so that we can compare them to our test rect - GrGLProcessorFragmentShaderBuilder* fsBuilder = builder->getFragmentShaderBuilder(); + GrGLGPFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); fsBuilder->codeAppendf("\t\tfloat xShifted = %s.x - floor(%s.x / %s) * %s;\n", fsCoordName, fsCoordName, intervalName, intervalName); fsBuilder->codeAppendf("\t\tvec2 fragPosShifted = vec2(xShifted, %s.y);\n", fsCoordName); diff --git a/src/gpu/effects/GrDistanceFieldTextureEffect.cpp b/src/gpu/effects/GrDistanceFieldTextureEffect.cpp index 265f112c2b..c8ed5c9eda 100755 --- a/src/gpu/effects/GrDistanceFieldTextureEffect.cpp +++ b/src/gpu/effects/GrDistanceFieldTextureEffect.cpp @@ -6,7 +6,7 @@ */ #include "GrDistanceFieldTextureEffect.h" -#include "gl/builders/GrGLFullProgramBuilder.h" +#include "gl/builders/GrGLProgramBuilder.h" #include "gl/GrGLProcessor.h" #include "gl/GrGLSL.h" #include "gl/GrGLTexture.h" @@ -40,7 +40,7 @@ public: #endif {} - virtual void emitCode(GrGLFullProgramBuilder* builder, + virtual void emitCode(GrGLGPBuilder* builder, const GrGeometryProcessor& geometryProcessor, const GrProcessorKey& key, const char* outputColor, @@ -51,7 +51,7 @@ public: geometryProcessor.cast<GrDistanceFieldTextureEffect>(); SkASSERT(1 == dfTexEffect.getVertexAttribs().count()); - GrGLProcessorFragmentShaderBuilder* fsBuilder = builder->getFragmentShaderBuilder(); + GrGLGPFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); SkAssertResult(fsBuilder->enableFeature( GrGLFragmentShaderBuilder::kStandardDerivatives_GLSLFeature)); @@ -61,7 +61,7 @@ public: builder->addVarying(kVec2f_GrSLType, "textureCoords", &vsCoordName, &fsCoordNamePtr); fsCoordName = fsCoordNamePtr; - GrGLVertexShaderBuilder* vsBuilder = builder->getVertexShaderBuilder(); + GrGLVertexBuilder* vsBuilder = builder->getVertexShaderBuilder(); vsBuilder->codeAppendf("\t%s = %s;\n", vsCoordName, dfTexEffect.inTextureCoords().c_str()); const char* textureSizeUniName = NULL; @@ -267,7 +267,7 @@ public: : INHERITED(factory) , fTextureSize(SkISize::Make(-1, -1)) {} - virtual void emitCode(GrGLFullProgramBuilder* builder, + virtual void emitCode(GrGLGPBuilder* builder, const GrGeometryProcessor& effect, const GrProcessorKey& key, const char* outputColor, @@ -278,7 +278,7 @@ public: effect.cast<GrDistanceFieldNoGammaTextureEffect>(); SkASSERT(1 == dfTexEffect.getVertexAttribs().count()); - GrGLProcessorFragmentShaderBuilder* fsBuilder = builder->getFragmentShaderBuilder(); + GrGLGPFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); SkAssertResult(fsBuilder->enableFeature( GrGLFragmentShaderBuilder::kStandardDerivatives_GLSLFeature)); @@ -288,7 +288,7 @@ public: builder->addVarying(kVec2f_GrSLType, "textureCoords", &vsCoordName, &fsCoordNamePtr); fsCoordName = fsCoordNamePtr; - GrGLVertexShaderBuilder* vsBuilder = builder->getVertexShaderBuilder(); + GrGLVertexBuilder* vsBuilder = builder->getVertexShaderBuilder(); vsBuilder->codeAppendf("%s = %s;", vsCoordName, dfTexEffect.inTextureCoords().c_str()); const char* textureSizeUniName = NULL; @@ -439,7 +439,7 @@ public: , fTextureSize(SkISize::Make(-1,-1)) , fTextColor(GrColor_ILLEGAL) {} - virtual void emitCode(GrGLFullProgramBuilder* builder, + virtual void emitCode(GrGLGPBuilder* builder, const GrGeometryProcessor& geometryProcessor, const GrProcessorKey& key, const char* outputColor, @@ -456,7 +456,7 @@ public: builder->addVarying(kVec2f_GrSLType, "textureCoords", &vsCoordName, &fsCoordNamePtr); fsCoordName = fsCoordNamePtr; - GrGLVertexShaderBuilder* vsBuilder = builder->getVertexShaderBuilder(); + GrGLVertexBuilder* vsBuilder = builder->getVertexShaderBuilder(); vsBuilder->codeAppendf("\t%s = %s;\n", vsCoordName, dfTexEffect.inTextureCoords().c_str()); const char* textureSizeUniName = NULL; @@ -465,7 +465,7 @@ public: kVec3f_GrSLType, "TextureSize", &textureSizeUniName); - GrGLProcessorFragmentShaderBuilder* fsBuilder = builder->getFragmentShaderBuilder(); + GrGLGPFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); SkAssertResult(fsBuilder->enableFeature( GrGLFragmentShaderBuilder::kStandardDerivatives_GLSLFeature)); |