commit 3e8c3458f036da88eca1225a5c6a2cce228f894e
author Greg Daniel <egdaniel@google.com> Fri Apr 06 10:37:55 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Apr 06 18:27:53 2018 +0000
tree b910cd1a3a25994bbf7b52effde770fae7a2fb2f
parent 4961a938586e3c46cf80f15ecb70a011324bfe59

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>

tests/SkSLFPTest.cpp

diff --git a/tests/SkSLFPTest.cpp b/tests/SkSLFPTest.cpp
index f1a65fc..03b3922 100644
--- a/tests/SkSLFPTest.cpp
+++ b/tests/SkSLFPTest.cpp
@@ -75,7 +75,6 @@
              "#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 @@
              "    typedef GrFragmentProcessor INHERITED;\n"
              "};\n"
              "#endif\n"
-             "#endif\n"
          },
          {
              "/* HEADER */\n"
@@ -107,7 +105,6 @@
              " *** 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 @@
              "std::unique_ptr<GrFragmentProcessor> GrTest::clone() const {\n"
              "    return std::unique_ptr<GrFragmentProcessor>(new GrTest(*this));\n"
              "}\n"
-             "#endif\n"
          });
 }
 
@@ -213,7 +209,7 @@
          "}",
          *SkSL::ShaderCapsFactory::Default(),
          {
-             "#if SK_SUPPORT_GPU\n header section"
+             "header section"
          },
          {});
     test(r,