diff options
| author |  Ethan Nicholas <ethannicholas@google.com> | 2017-07-10 13:12:07 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-07-10 13:35:25 +0000 |
| commit | 818ac5a00dfd570d2b291b7524a70ecd4ef55770 (patch) | |
| tree | f0992c09dc6825729cbdf29fd155243f8150058a /src/sksl/SkSLHCodeGenerator.cpp | |
| parent | 086ce11386849c445a99c7bb8c43947f54618a75 (diff) | |
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 <ethannicholas@google.com>
> Reviewed-by: Brian Salomon <bsalomon@google.com>
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 <ethannicholas@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Diffstat (limited to 'src/sksl/SkSLHCodeGenerator.cpp')
| -rw-r--r-- | src/sksl/SkSLHCodeGenerator.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/sksl/SkSLHCodeGenerator.cpp b/src/sksl/SkSLHCodeGenerator.cpp index cd3f7f2ec1..405fb0e6ce 100644 --- a/src/sksl/SkSLHCodeGenerator.cpp +++ b/src/sksl/SkSLHCodeGenerator.cpp @@ -201,8 +201,6 @@ bool HCodeGenerator::generateCode() { "#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" @@ -233,8 +231,7 @@ bool HCodeGenerator::generateCode() { this->writef(" typedef GrFragmentProcessor INHERITED;\n" "};\n"); this->writeSection(HEADER_END_SECTION); - this->writef("#endif\n" - "#endif\n"); + this->writef("#endif\n"); return 0 == fErrors.errorCount(); } |