diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-08-30 19:11:34 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-08-30 19:11:34 +0000 |
| commit | 868a8e7fc83e9ac6ee1418e75b84a0595605626c (patch) | |
| tree | 6099dee09e40beed726e2f6d300485935b73cbb2 /src/gpu/effects/GrConfigConversionEffect.cpp | |
| parent | 7426743837051f43dbc1209775b391b917c69c54 (diff) | |
Recommit r5350 with fix for image failures (which affected GLs that don't support ARB_texture_swizzle).
git-svn-id: http://skia.googlecode.com/svn/trunk@5353 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu/effects/GrConfigConversionEffect.cpp')
| -rw-r--r-- | src/gpu/effects/GrConfigConversionEffect.cpp | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/src/gpu/effects/GrConfigConversionEffect.cpp b/src/gpu/effects/GrConfigConversionEffect.cpp index fbf5a4090a..318c03e653 100644 --- a/src/gpu/effects/GrConfigConversionEffect.cpp +++ b/src/gpu/effects/GrConfigConversionEffect.cpp @@ -23,37 +23,39 @@ public: const char* outputColor, const char* inputColor, const char* samplerName) SK_OVERRIDE { - builder->fFSCode.append("\tvec4 tempColor;\n"); - builder->emitTextureLookupAndModulate("tempColor", samplerName); + builder->fFSCode.appendf("\t\t%s = ", outputColor); + builder->appendTextureLookup(&builder->fFSCode, samplerName); + builder->fFSCode.appendf("%s;\n", builder->fSwizzle.c_str()); if (GrConfigConversionEffect::kNone_PMConversion == fPMConversion) { GrAssert(fSwapRedAndBlue); - builder->fFSCode.appendf("\t%s = tempColor.bgra;\n", outputColor); + builder->fFSCode.appendf("\t%s = %s.bgra;\n", outputColor, outputColor); } else { const char* swiz = fSwapRedAndBlue ? "bgr" : "rgb"; switch (fPMConversion) { case GrConfigConversionEffect::kMulByAlpha_RoundUp_PMConversion: builder->fFSCode.appendf( - "\t%s = vec4(ceil(tempColor.%s*tempColor.a*255.0)/255.0, tempColor.a);\n", - outputColor, swiz); + "\t\t%s = vec4(ceil(%s.%s * %s.a * 255.0) / 255.0, %s.a);\n", + outputColor, outputColor, swiz, outputColor, outputColor); break; case GrConfigConversionEffect::kMulByAlpha_RoundDown_PMConversion: builder->fFSCode.appendf( - "\t%s = vec4(floor(tempColor.%s*tempColor.a*255.0)/255.0, tempColor.a);\n", - outputColor, swiz); + "\t\t%s = vec4(floor(%s.%s * %s.a * 255.0) / 255.0, %s.a);\n", + outputColor, outputColor, swiz, outputColor, outputColor); break; case GrConfigConversionEffect::kDivByAlpha_RoundUp_PMConversion: - builder->fFSCode.appendf("\t%s = tempColor.a <= 0.0 ? vec4(0,0,0,0) : vec4(ceil(tempColor.%s / tempColor.a * 255.0)/255.0, tempColor.a);\n", - outputColor, swiz); + builder->fFSCode.appendf("\t\t%s = %s.a <= 0.0 ? vec4(0,0,0,0) : vec4(ceil(%s.%s / %s.a * 255.0) / 255.0, %s.a);\n", + outputColor, outputColor, outputColor, swiz, outputColor, outputColor); break; case GrConfigConversionEffect::kDivByAlpha_RoundDown_PMConversion: - builder->fFSCode.appendf("\t%s = tempColor.a <= 0.0 ? vec4(0,0,0,0) : vec4(floor(tempColor.%s / tempColor.a * 255.0)/255.0, tempColor.a);\n", - outputColor, swiz); + builder->fFSCode.appendf("\t\t%s = %s.a <= 0.0 ? vec4(0,0,0,0) : vec4(floor(%s.%s / %s.a * 255.0) / 255.0, %s.a);\n", + outputColor, outputColor, outputColor, swiz, outputColor, outputColor); break; default: GrCrash("Unknown conversion op."); break; } } + GrGLSLMulVarBy4f(&builder->fFSCode, 2, outputColor, inputColor); } static inline StageKey GenKey(const GrCustomStage& s, const GrGLCaps&) { |