Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(16)

Unified Diff: src/gpu/effects/GrConfigConversionEffect.cpp

Issue 277323002: Make GrGLConfigConversionEffect work for Imagination and some other GPUs. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/gpu/effects/GrConfigConversionEffect.h ('k') | src/gpu/gl/GrGLShaderBuilder.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/effects/GrConfigConversionEffect.cpp
diff --git a/src/gpu/effects/GrConfigConversionEffect.cpp b/src/gpu/effects/GrConfigConversionEffect.cpp
index f33ad239c518b1de5f98ccec29e02394670a9dd0..4b5b99fd86b7e52d97064f33860d73d17cda05e3 100644
--- a/src/gpu/effects/GrConfigConversionEffect.cpp
+++ b/src/gpu/effects/GrConfigConversionEffect.cpp
@@ -29,6 +29,8 @@ public:
const char* inputColor,
const TransformedCoordsArray& coords,
const TextureSamplerArray& samplers) SK_OVERRIDE {
+ const char* outputColorH = "outputColorH";
+ builder->fsCodeAppendf("\thighp vec4 %s;\n", outputColorH);
bsalomon 2014/07/08 13:10:15 It looks like we're still always declaring this va
changjun.yang 2014/07/09 03:02:09 Done. And looks we still need the outputColorH tho
builder->fsCodeAppendf("\t\t%s = ", outputColor);
builder->fsAppendTextureLookup(samplers[0], coords[0].c_str(), coords[0].type());
builder->fsCodeAppend(";\n");
@@ -60,6 +62,32 @@ 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("\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("\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("\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("\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;
@@ -184,6 +212,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);
« no previous file with comments | « src/gpu/effects/GrConfigConversionEffect.h ('k') | src/gpu/gl/GrGLShaderBuilder.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698