From 818ac5a00dfd570d2b291b7524a70ecd4ef55770 Mon Sep 17 00:00:00 2001 From: Ethan Nicholas Date: Mon, 10 Jul 2017 13:12:07 +0000 Subject: 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 > Reviewed-by: Brian Salomon 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 Commit-Queue: Ethan Nicholas --- tests/SkSLFPTest.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'tests/SkSLFPTest.cpp') 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, -- cgit v1.2.3