commit ceb4d48ef4839aab9d99d0200dcfe403ccd0cdf3
author Ethan Nicholas <ethannicholas@google.com> Mon Jul 10 15:40:20 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Jul 11 13:50:51 2017 +0000
tree fe8daf04d9a10810747e78e9a340e8d89ff90692
parent 815486c42f1ca66c81e12d8ccc9fb142e3c10544

Re-land "converted GrCircleBlurFragmentProcessor to sksl"

This reverts commit 818ac5a00dfd570d2b291b7524a70ecd4ef55770.

Bug: skia:
Change-Id: I9bd8a06bd2dbb40bd261d64d6d04daf864bc00a5
Reviewed-on: https://skia-review.googlesource.com/22075
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>

src/sksl/SkSLHCodeGenerator.cpp

diff --git a/src/sksl/SkSLHCodeGenerator.cpp b/src/sksl/SkSLHCodeGenerator.cpp
index 405fb0e..cd3f7f2 100644
--- a/src/sksl/SkSLHCodeGenerator.cpp
+++ b/src/sksl/SkSLHCodeGenerator.cpp
@@ -201,6 +201,8 @@
                  "#define %s_DEFINED\n",
                  fFullName.c_str(),
                  fFullName.c_str());
+    this->writef("#include \"SkTypes.h\"\n"
+                 "#if SK_SUPPORT_GPU\n");
     this->writeSection(HEADER_SECTION);
     this->writef("#include \"GrFragmentProcessor.h\"\n"
                  "#include \"GrCoordTransform.h\"\n"
@@ -231,7 +233,8 @@
     this->writef("    typedef GrFragmentProcessor INHERITED;\n"
                 "};\n");
     this->writeSection(HEADER_END_SECTION);
-    this->writef("#endif\n");
+    this->writef("#endif\n"
+                 "#endif\n");
     return 0 == fErrors.errorCount();
 }