diff options
| author |  Greg Daniel <egdaniel@google.com> | 2018-04-06 10:37:55 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-04-06 18:27:53 +0000 |
| commit | 3e8c3458f036da88eca1225a5c6a2cce228f894e (patch) | |
| tree | b910cd1a3a25994bbf7b52effde770fae7a2fb2f /tests/SkSLFPTest.cpp | |
| parent | 4961a938586e3c46cf80f15ecb70a011324bfe59 (diff) | |
Make generated effects from sksl fp files not need SK_SUPPORT_GPU
Bug: skia:
Change-Id: I42a5c7fe7dc35a23290c8daa754c9fcce07f76fb
Reviewed-on: https://skia-review.googlesource.com/119010
Commit-Queue: Greg Daniel <egdaniel@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'tests/SkSLFPTest.cpp')
| -rw-r--r-- | tests/SkSLFPTest.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/tests/SkSLFPTest.cpp b/tests/SkSLFPTest.cpp index f1a65fcfdb..03b3922ec2 100644 --- a/tests/SkSLFPTest.cpp +++ b/tests/SkSLFPTest.cpp @@ -75,7 +75,6 @@ DEF_TEST(SkSLFPHelloWorld, r) { "#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" "class GrTest : public GrFragmentProcessor {\n" @@ -98,7 +97,6 @@ DEF_TEST(SkSLFPHelloWorld, r) { " typedef GrFragmentProcessor INHERITED;\n" "};\n" "#endif\n" - "#endif\n" }, { "/* HEADER */\n" @@ -107,7 +105,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/GrGLSLFragmentProcessor.h\"\n" "#include \"glsl/GrGLSLFragmentShaderBuilder.h\"\n" "#include \"glsl/GrGLSLProgramBuilder.h\"\n" @@ -145,7 +142,6 @@ DEF_TEST(SkSLFPHelloWorld, r) { "std::unique_ptr<GrFragmentProcessor> GrTest::clone() const {\n" " return std::unique_ptr<GrFragmentProcessor>(new GrTest(*this));\n" "}\n" - "#endif\n" }); } @@ -213,7 +209,7 @@ DEF_TEST(SkSLFPSections, r) { "}", *SkSL::ShaderCapsFactory::Default(), { - "#if SK_SUPPORT_GPU\n header section" + "header section" }, {}); test(r, |