From 9b80ffc77b8000b493eb1226dc6ec21f1e99edfc Mon Sep 17 00:00:00 2001 From: Ethan Nicholas Date: Fri, 7 Jul 2017 10:13:31 -0400 Subject: 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 --- tests/SkSLFPTest.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'tests/SkSLFPTest.cpp') diff --git a/tests/SkSLFPTest.cpp b/tests/SkSLFPTest.cpp index 64b4e71d8e..38f12e1659 100644 --- a/tests/SkSLFPTest.cpp +++ b/tests/SkSLFPTest.cpp @@ -78,6 +78,8 @@ 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" @@ -100,6 +102,7 @@ DEF_TEST(SkSLFPHelloWorld, r) { " typedef GrFragmentProcessor INHERITED;\n" "};\n" "#endif\n" + "#endif\n" }, { "/*\n" @@ -113,6 +116,7 @@ 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" @@ -144,6 +148,7 @@ DEF_TEST(SkSLFPHelloWorld, r) { " (void) that;\n" " return true;\n" "}\n" + "#endif\n" }); } @@ -211,7 +216,7 @@ DEF_TEST(SkSLFPSections, r) { "}", *SkSL::ShaderCapsFactory::Default(), { - "#define GrTest_DEFINED\n header section" + "#if SK_SUPPORT_GPU\n header section" }, {}); test(r, -- cgit v1.2.3