diff options
| author |  changjun.yang <changjun.yang@intel.com> | 2014-07-09 06:47:29 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-07-09 06:47:29 -0700 |
| commit | 93cf46f7d687128d2ad05762bd65fea6c4539553 (patch) | |
| tree | a27d6f89a1363d79556064733c9478c1e2d3f67b /src/gpu/effects | |
| parent | b4edbffd7c09ca172f95fc30381671962e22dee0 (diff) | |
Make GrGLConfigConversionEffect work for Imagination and some other GPUs.
BUG=372341
R=tomhudson@chromium.org, bsalomon@google.com
Author: changjun.yang@intel.com
Review URL: https://codereview.chromium.org/277323002
Diffstat (limited to 'src/gpu/effects')
| -rw-r--r-- | src/gpu/effects/GrConfigConversionEffect.cpp | 33 | ||||
| -rw-r--r-- | src/gpu/effects/GrConfigConversionEffect.h | 4 |
2 files changed, 37 insertions, 0 deletions
diff --git a/src/gpu/effects/GrConfigConversionEffect.cpp b/src/gpu/effects/GrConfigConversionEffect.cpp index ff18ef266d..0e0c9d1cd6 100644 --- a/src/gpu/effects/GrConfigConversionEffect.cpp +++ b/src/gpu/effects/GrConfigConversionEffect.cpp @@ -37,6 +37,7 @@ 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( @@ -60,6 +61,36 @@ 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; @@ -183,6 +214,8 @@ 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 4416d05452..74f717f283 100644 --- a/src/gpu/effects/GrConfigConversionEffect.h +++ b/src/gpu/effects/GrConfigConversionEffect.h @@ -30,6 +30,10 @@ 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 }; |