diff options
| author |  Ethan Nicholas <ethannicholas@google.com> | 2017-07-10 13:12:07 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-07-10 13:35:25 +0000 |
| commit | 818ac5a00dfd570d2b291b7524a70ecd4ef55770 (patch) | |
| tree | f0992c09dc6825729cbdf29fd155243f8150058a /tests/SkSLFPTest.cpp | |
| parent | 086ce11386849c445a99c7bb8c43947f54618a75 (diff) | |
Revert "converted GrCircleBlurFragmentProcessor to sksl"
This reverts commit 9b80ffc77b8000b493eb1226dc6ec21f1e99edfc.
Reason for revert: breaking ANGLE and Android Vulkan GMs
Original change's description:
> converted GrCircleBlurFragmentProcessor to sksl
>
> Bug: skia:
> Change-Id: I1b70ba2003c9e9de2b5b9acadaf25c9ed59b1198
> Reviewed-on: https://skia-review.googlesource.com/21727
> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
> Reviewed-by: Brian Salomon <bsalomon@google.com>
TBR=bsalomon@google.com,ethannicholas@google.com
# Not skipping CQ checks because original CL landed > 1 day ago.
Bug: skia:
Change-Id: Ia313013b4354b34fa5a02bdb16d007a462c5ca94
Reviewed-on: https://skia-review.googlesource.com/22028
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Diffstat (limited to 'tests/SkSLFPTest.cpp')
| -rw-r--r-- | tests/SkSLFPTest.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/tests/SkSLFPTest.cpp b/tests/SkSLFPTest.cpp index 38f12e1659..64b4e71d8e 100644 --- a/tests/SkSLFPTest.cpp +++ b/tests/SkSLFPTest.cpp @@ -78,8 +78,6 @@ DEF_TEST(SkSLFPHelloWorld, r) { " */\n" "#ifndef GrTest_DEFINED\n" "#define GrTest_DEFINED\n" - "#include \"SkTypes.h\"\n" - "#if SK_SUPPORT_GPU\n" "#include \"GrFragmentProcessor.h\"\n" "#include \"GrCoordTransform.h\"\n" "#include \"effects/GrProxyMove.h\"\n" @@ -102,7 +100,6 @@ DEF_TEST(SkSLFPHelloWorld, r) { " typedef GrFragmentProcessor INHERITED;\n" "};\n" "#endif\n" - "#endif\n" }, { "/*\n" @@ -116,7 +113,6 @@ DEF_TEST(SkSLFPHelloWorld, r) { " * This file was autogenerated from GrTest.fp; do not modify.\n" " */\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" @@ -148,7 +144,6 @@ DEF_TEST(SkSLFPHelloWorld, r) { " (void) that;\n" " return true;\n" "}\n" - "#endif\n" }); } @@ -216,7 +211,7 @@ DEF_TEST(SkSLFPSections, r) { "}", *SkSL::ShaderCapsFactory::Default(), { - "#if SK_SUPPORT_GPU\n header section" + "#define GrTest_DEFINED\n header section" }, {}); test(r, |