diff options
| -rw-r--r-- | src/gpu/effects/GrConfigConversionEffect.cpp | 33 | ||||
| -rw-r--r-- | src/gpu/effects/GrConfigConversionEffect.h | 4 | ||||
| -rw-r--r-- | src/gpu/gl/GrGLShaderBuilder.cpp | 1 |
3 files changed, 1 insertions, 37 deletions
diff --git a/src/gpu/effects/GrConfigConversionEffect.cpp b/src/gpu/effects/GrConfigConversionEffect.cpp index 0e0c9d1cd6..ff18ef266d 100644 --- a/src/gpu/effects/GrConfigConversionEffect.cpp +++ b/src/gpu/effects/GrConfigConversionEffect.cpp @@ -37,7 +37,6 @@ public: builder->fsCodeAppendf("\t%s = %s.bgra;\n", outputColor, outputColor); } else { const char* swiz = fSwapRedAndBlue ? "bgr" : "rgb"; - const char* outputColorH = "outputColorH"; switch (fPMConversion) { case GrConfigConversionEffect::kMulByAlpha_RoundUp_PMConversion: builder->fsCodeAppendf( @@ -61,36 +60,6 @@ public: builder->fsCodeAppendf("\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; - case GrConfigConversionEffect::kMulByAlpha_RoundUp_HIGHP_PMConversion: - builder->fsCodeAppendf("\thighp vec4 %s;\n", outputColorH); - builder->fsCodeAppendf("\t\t%s = %s;\n", outputColorH, outputColor); - builder->fsCodeAppendf( - "\t\t%s = vec4(ceil(%s.%s * %s.a * 255.0) / 255.0, %s.a);\n", - outputColorH, outputColorH, swiz, outputColorH, outputColorH); - builder->fsCodeAppendf("\t\t%s = %s;\n", outputColor, outputColorH); - break; - case GrConfigConversionEffect::kMulByAlpha_RoundDown_HIGHP_PMConversion: - builder->fsCodeAppendf("\thighp vec4 %s;\n", outputColorH); - builder->fsCodeAppendf("\t\t%s = %s;\n", outputColorH, outputColor); - builder->fsCodeAppendf( - "\t\t%s = vec4(floor(%s.%s * %s.a * 255.0) / 255.0, %s.a);\n", - outputColorH, outputColorH, swiz, outputColorH, outputColorH); - builder->fsCodeAppendf("\t\t%s = %s;\n", outputColor, outputColorH); - break; - case GrConfigConversionEffect::kDivByAlpha_RoundUp_HIGHP_PMConversion: - builder->fsCodeAppendf("\thighp vec4 %s;\n", outputColorH); - builder->fsCodeAppendf("\t\t%s = %s;\n", outputColorH, outputColor); - builder->fsCodeAppendf("\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", - outputColorH, outputColorH, outputColorH, swiz, outputColorH, outputColorH); - builder->fsCodeAppendf("\t\t%s = %s;\n", outputColor, outputColorH); - break; - case GrConfigConversionEffect::kDivByAlpha_RoundDown_HIGHP_PMConversion: - builder->fsCodeAppendf("\thighp vec4 %s;\n", outputColorH); - builder->fsCodeAppendf("\t\t%s = %s;\n", outputColorH, outputColor); - builder->fsCodeAppendf("\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", - outputColorH, outputColorH, outputColorH, swiz, outputColorH, outputColorH); - builder->fsCodeAppendf("\t\t%s = %s;\n", outputColor, outputColorH); - break; default: SkFAIL("Unknown conversion op."); break; @@ -214,8 +183,6 @@ void GrConfigConversionEffect::TestForPreservingPMConversions(GrContext* context static const PMConversion kConversionRules[][2] = { {kDivByAlpha_RoundDown_PMConversion, kMulByAlpha_RoundUp_PMConversion}, {kDivByAlpha_RoundUp_PMConversion, kMulByAlpha_RoundDown_PMConversion}, - {kDivByAlpha_RoundDown_HIGHP_PMConversion, kMulByAlpha_RoundUp_HIGHP_PMConversion}, - {kDivByAlpha_RoundUp_HIGHP_PMConversion, kMulByAlpha_RoundDown_HIGHP_PMConversion}, }; GrContext::AutoWideOpenIdentityDraw awoid(context, NULL); diff --git a/src/gpu/effects/GrConfigConversionEffect.h b/src/gpu/effects/GrConfigConversionEffect.h index 74f717f283..4416d05452 100644 --- a/src/gpu/effects/GrConfigConversionEffect.h +++ b/src/gpu/effects/GrConfigConversionEffect.h @@ -30,10 +30,6 @@ public: kMulByAlpha_RoundDown_PMConversion, kDivByAlpha_RoundUp_PMConversion, kDivByAlpha_RoundDown_PMConversion, - kMulByAlpha_RoundUp_HIGHP_PMConversion, - kMulByAlpha_RoundDown_HIGHP_PMConversion, - kDivByAlpha_RoundUp_HIGHP_PMConversion, - kDivByAlpha_RoundDown_HIGHP_PMConversion, kPMConversionCnt }; diff --git a/src/gpu/gl/GrGLShaderBuilder.cpp b/src/gpu/gl/GrGLShaderBuilder.cpp index d95cd6621c..4b7de02793 100644 --- a/src/gpu/gl/GrGLShaderBuilder.cpp +++ b/src/gpu/gl/GrGLShaderBuilder.cpp @@ -630,6 +630,7 @@ void GrGLShaderBuilder::createAndEmitEffects(GrGLProgramEffectsBuilder* programE this->fsCodeAppendf("\tvec4 %s;\n", outColorName.c_str()); outColor = outColorName; + programEffectsBuilder->emitEffect(stage, effectKeys[e], outColor.c_str(), |