diff options
| author |  Ethan Nicholas <ethannicholas@google.com> | 2017-07-13 09:36:52 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-07-13 14:07:02 +0000 |
| commit | 68990be759f663bafdb7c1b746adce15557cda7f (patch) | |
| tree | b982e218f45fa02188bb38fe767797ff6315edcf /tests/SkSLFPTest.cpp | |
| parent | c20b5f83595073c02009ff3c0a8a77aca6ad1e71 (diff) | |
Re-land of "converted GrSimpleTextureEffect to sksl"
This reverts commit baf981f71614e7a2fbe6af2726e65126d431ed8e.
Bug: skia:
Change-Id: I36f6bfb616f1ec2b89043e3a6f7cbdf473bc9588
Reviewed-on: https://skia-review.googlesource.com/22369
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Diffstat (limited to 'tests/SkSLFPTest.cpp')
| -rw-r--r-- | tests/SkSLFPTest.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/tests/SkSLFPTest.cpp b/tests/SkSLFPTest.cpp index 62cfa6cf9c..a5a1a6ebeb 100644 --- a/tests/SkSLFPTest.cpp +++ b/tests/SkSLFPTest.cpp @@ -82,6 +82,7 @@ DEF_TEST(SkSLFPHelloWorld, r) { "#if SK_SUPPORT_GPU\n" "#include \"GrFragmentProcessor.h\"\n" "#include \"GrCoordTransform.h\"\n" + "#include \"GrColorSpaceXform.h\"\n" "#include \"effects/GrProxyMove.h\"\n" "class GrTest : public GrFragmentProcessor {\n" "public:\n" @@ -353,16 +354,14 @@ DEF_TEST(SkSLFPColorSpaceXform, r) { "sk_sp<GrColorSpaceXform> fColorXform;" }, { - "fragBuilder->codeAppendf(\"vec4 _tmp0;\\n%s = %s * (_tmp0 = texture(%s, " - "vec2(0.0, 0.0)).%s , %s != mat4(1.0) ? vec4(clamp((%s * vec4(_tmp0.xyz, 1.0)).xyz, " - "0.0, _tmp0.w), _tmp0.w) : _tmp0);\\n\", args.fOutputColor, args.fInputColor ? " - "args.fInputColor : \"vec4(1)\", fragBuilder->getProgramBuilder()->" - "samplerVariable(args.fTexSamplers[0]).c_str(), " + "fragBuilder->codeAppendf(\"vec4 _tmpVar1;%s = %s * %stexture(%s, " + "vec2(0.0, 0.0)).%s%s;\\n\", args.fOutputColor, args.fInputColor ? args.fInputColor : " + "\"vec4(1)\", fColorSpaceHelper.isValid() ? \"(_tmpVar1 = \" : \"\", " + "fragBuilder->getProgramBuilder()->samplerVariable(args.fTexSamplers[0]).c_str(), " "fragBuilder->getProgramBuilder()->samplerSwizzle(args.fTexSamplers[0]).c_str(), " - "fColorSpaceHelper.isValid() ? args.fUniformHandler->getUniformCStr(" - "fColorSpaceHelper.gamutXformUniform()) : \"mat4(1.0)\", " - "fColorSpaceHelper.isValid() ? args.fUniformHandler->getUniformCStr(" - "fColorSpaceHelper.gamutXformUniform()) : \"mat4(1.0)\");" + "fColorSpaceHelper.isValid() ? SkStringPrintf(\", vec4(clamp((%s * vec4(_tmpVar1.rgb, " + "1.0)).rgb, 0.0, _tmpVar1.a), _tmpVar1.a))\", args.fUniformHandler->getUniformCStr(" + "fColorSpaceHelper.gamutXformUniform())).c_str() : \"\");" }); } |