| Index: src/gpu/effects/GrConfigConversionEffect.cpp
|
| diff --git a/src/gpu/effects/GrConfigConversionEffect.cpp b/src/gpu/effects/GrConfigConversionEffect.cpp
|
| index dfe3e04a40b465d11f6144c7c935a54c92cb9b57..94ffc39340e8871a054caa1a1262db287f21a204 100644
|
| --- a/src/gpu/effects/GrConfigConversionEffect.cpp
|
| +++ b/src/gpu/effects/GrConfigConversionEffect.cpp
|
| @@ -30,23 +30,23 @@ public:
|
| SkString tmpDecl;
|
| tmpVar.appendDecl(args.fBuilder->glslCaps(), &tmpDecl);
|
|
|
| - GrGLSLFragmentBuilder* fsBuilder = args.fBuilder->getFragmentShaderBuilder();
|
| + GrGLSLFragmentBuilder* fragBuilder = args.fFragBuilder;
|
|
|
| - fsBuilder->codeAppendf("%s;", tmpDecl.c_str());
|
| + fragBuilder->codeAppendf("%s;", tmpDecl.c_str());
|
|
|
| - fsBuilder->codeAppendf("%s = ", tmpVar.c_str());
|
| - fsBuilder->appendTextureLookup(args.fSamplers[0], args.fCoords[0].c_str(),
|
| + fragBuilder->codeAppendf("%s = ", tmpVar.c_str());
|
| + fragBuilder->appendTextureLookup(args.fSamplers[0], args.fCoords[0].c_str(),
|
| args.fCoords[0].getType());
|
| - fsBuilder->codeAppend(";");
|
| + fragBuilder->codeAppend(";");
|
|
|
| if (GrConfigConversionEffect::kNone_PMConversion == fPMConversion) {
|
| SkASSERT(fSwapRedAndBlue);
|
| - fsBuilder->codeAppendf("%s = %s.bgra;", args.fOutputColor, tmpVar.c_str());
|
| + fragBuilder->codeAppendf("%s = %s.bgra;", args.fOutputColor, tmpVar.c_str());
|
| } else {
|
| const char* swiz = fSwapRedAndBlue ? "bgr" : "rgb";
|
| switch (fPMConversion) {
|
| case GrConfigConversionEffect::kMulByAlpha_RoundUp_PMConversion:
|
| - fsBuilder->codeAppendf(
|
| + fragBuilder->codeAppendf(
|
| "%s = vec4(ceil(%s.%s * %s.a * 255.0) / 255.0, %s.a);",
|
| tmpVar.c_str(), tmpVar.c_str(), swiz, tmpVar.c_str(), tmpVar.c_str());
|
| break;
|
| @@ -55,17 +55,17 @@ public:
|
| // In Intel GPUs, the integer value converted from floor(%s.r * 255.0) / 255.0
|
| // is less than the integer value converted from %s.r by 1 when the %s.r is
|
| // converted from the integer value 2^n, such as 1, 2, 4, 8, etc.
|
| - fsBuilder->codeAppendf(
|
| + fragBuilder->codeAppendf(
|
| "%s = vec4(floor(%s.%s * %s.a * 255.0 + 0.001) / 255.0, %s.a);",
|
| tmpVar.c_str(), tmpVar.c_str(), swiz, tmpVar.c_str(), tmpVar.c_str());
|
| break;
|
| case GrConfigConversionEffect::kDivByAlpha_RoundUp_PMConversion:
|
| - fsBuilder->codeAppendf(
|
| + fragBuilder->codeAppendf(
|
| "%s = %s.a <= 0.0 ? vec4(0,0,0,0) : vec4(ceil(%s.%s / %s.a * 255.0) / 255.0, %s.a);",
|
| tmpVar.c_str(), tmpVar.c_str(), tmpVar.c_str(), swiz, tmpVar.c_str(), tmpVar.c_str());
|
| break;
|
| case GrConfigConversionEffect::kDivByAlpha_RoundDown_PMConversion:
|
| - fsBuilder->codeAppendf(
|
| + fragBuilder->codeAppendf(
|
| "%s = %s.a <= 0.0 ? vec4(0,0,0,0) : vec4(floor(%s.%s / %s.a * 255.0) / 255.0, %s.a);",
|
| tmpVar.c_str(), tmpVar.c_str(), tmpVar.c_str(), swiz, tmpVar.c_str(), tmpVar.c_str());
|
| break;
|
| @@ -73,11 +73,11 @@ public:
|
| SkFAIL("Unknown conversion op.");
|
| break;
|
| }
|
| - fsBuilder->codeAppendf("%s = %s;", args.fOutputColor, tmpVar.c_str());
|
| + fragBuilder->codeAppendf("%s = %s;", args.fOutputColor, tmpVar.c_str());
|
| }
|
| SkString modulate;
|
| GrGLSLMulVarBy4f(&modulate, args.fOutputColor, args.fInputColor);
|
| - fsBuilder->codeAppend(modulate.c_str());
|
| + fragBuilder->codeAppend(modulate.c_str());
|
| }
|
|
|
| static inline void GenKey(const GrProcessor& processor, const GrGLSLCaps&,
|
|
|