diff options
| author |  Brian Osman <brianosman@google.com> | 2017-10-19 12:54:52 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-10-23 15:27:12 +0000 |
| commit | 1cb41717bc4a44272eab48bd47ca7579425dc22e (patch) | |
| tree | b8aa968f554069942403ceaa4d3e7ba9c3eb736e /tests/SkSLFPTest.cpp | |
| parent | e25d119709899d3cb101a6de5fc901baf04d46db (diff) | |
Remove color space xform support from SkSL
Bug: skia:
Change-Id: Ia50c1f750e4626211f012ae7543db126b10134c3
Reviewed-on: https://skia-review.googlesource.com/61906
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Diffstat (limited to 'tests/SkSLFPTest.cpp')
| -rw-r--r-- | tests/SkSLFPTest.cpp | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/tests/SkSLFPTest.cpp b/tests/SkSLFPTest.cpp index ce09b952a7..0358f07d59 100644 --- a/tests/SkSLFPTest.cpp +++ b/tests/SkSLFPTest.cpp @@ -82,7 +82,6 @@ DEF_TEST(SkSLFPHelloWorld, r) { "#if SK_SUPPORT_GPU\n" "#include \"GrFragmentProcessor.h\"\n" "#include \"GrCoordTransform.h\"\n" - "#include \"GrColorSpaceXform.h\"\n" "class GrTest : public GrFragmentProcessor {\n" "public:\n" " static std::unique_ptr<GrFragmentProcessor> Make() {\n" @@ -118,7 +117,6 @@ DEF_TEST(SkSLFPHelloWorld, r) { " */\n" "#include \"GrTest.h\"\n" "#if SK_SUPPORT_GPU\n" - "#include \"glsl/GrGLSLColorSpaceXformHelper.h\"\n" "#include \"glsl/GrGLSLFragmentProcessor.h\"\n" "#include \"glsl/GrGLSLFragmentShaderBuilder.h\"\n" "#include \"glsl/GrGLSLProgramBuilder.h\"\n" @@ -346,32 +344,6 @@ DEF_TEST(SkSLFPSections, r) { }); } -DEF_TEST(SkSLFPColorSpaceXform, r) { - test(r, - "in uniform sampler2D image;" - "in uniform colorSpaceXform colorXform;" - "void main() {" - "sk_OutColor = sk_InColor * texture(image, float2(0, 0), colorXform);" - "}", - *SkSL::ShaderCapsFactory::Default(), - { - "sk_sp<GrColorSpaceXform> colorXform() const { return fColorXform; }", - "GrTest(sk_sp<GrTextureProxy> image, sk_sp<GrColorSpaceXform> colorXform)", - "this->addTextureSampler(&fImage);", - "sk_sp<GrColorSpaceXform> fColorXform;" - }, - { - "fragBuilder->codeAppendf(\"half4 _tmpVar1;%s = %s * %stexture(%s, " - "float2(0.0, 0.0)).%s%s;\\n\", args.fOutputColor, args.fInputColor ? args.fInputColor : " - "\"half4(1)\", fColorSpaceHelper.isValid() ? \"(_tmpVar1 = \" : \"\", " - "fragBuilder->getProgramBuilder()->samplerVariable(args.fTexSamplers[0]).c_str(), " - "fragBuilder->getProgramBuilder()->samplerSwizzle(args.fTexSamplers[0]).c_str(), " - "fColorSpaceHelper.isValid() ? SkStringPrintf(\", half4(clamp((%s * half4(_tmpVar1.rgb, " - "1.0)).rgb, 0.0, _tmpVar1.a), _tmpVar1.a))\", args.fUniformHandler->getUniformCStr(" - "fColorSpaceHelper.gamutXformUniform())).c_str() : \"\");" - }); -} - DEF_TEST(SkSLFPTransformedCoords, r) { test(r, "void main() {" |