diff options
| author |  Leon Scroggins <scroggo@google.com> | 2016-11-11 18:44:37 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-11-11 18:44:49 +0000 |
| commit | 857cb97a34ea1870b20ecbae6aa937a57243359c (patch) | |
| tree | d4463c7074eeafa6600c85da06b4c576f4e9c792 /src/sksl/SkSLMain.cpp | |
| parent | 294870ff119b89fc902773643b054f14e5d1f554 (diff) | |
Revert "re-land of skslc now uses standard Skia caps"
This reverts commit 498d403f7703cb2157bf3c877b84906db5a06cd4.
Reason for revert: Breaking compile bot:
https://uberchromegw.corp.google.com/i/client.skia.compile/builders/Build-Ubuntu-GCC-x86_64-Release-NoGPU/builds/10116/steps/compile_skia%20on%20Ubuntu/logs/stdio
undefined reference to `GrGLSLCaps::GrGLSLCaps(GrContextOptions const&)
Original change's description:
> re-land of skslc now uses standard Skia caps
>
> BUG=skia:
>
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4726
>
> Change-Id: Ib1ea5d4269396e6c57ee1f0d7209aa9a9f2798e8
> Reviewed-on: https://skia-review.googlesource.com/4726
> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
>
TBR=bsalomon@google.com,benjaminwagner@google.com,kjlubick@google.com,ethannicholas@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: I7ee96d6c658be6b7b79027c147b8950c78c79a70
Reviewed-on: https://skia-review.googlesource.com/4729
Commit-Queue: Leon Scroggins <scroggo@google.com>
Reviewed-by: Leon Scroggins <scroggo@google.com>
Diffstat (limited to 'src/sksl/SkSLMain.cpp')
| -rw-r--r-- | src/sksl/SkSLMain.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/sksl/SkSLMain.cpp b/src/sksl/SkSLMain.cpp index 3658992412..eb07b4d032 100644 --- a/src/sksl/SkSLMain.cpp +++ b/src/sksl/SkSLMain.cpp @@ -8,7 +8,6 @@ #include "stdio.h" #include <fstream> #include "SkSLCompiler.h" -#include "GrContextOptions.h" bool endsWith(const std::string& s, const std::string& ending) { if (s.length() >= ending.length()) { @@ -58,7 +57,7 @@ int main(int argc, const char** argv) { } else if (endsWith(name, ".glsl")) { std::ofstream out(argv[2], std::ofstream::binary); SkSL::Compiler compiler; - if (!compiler.toGLSL(kind, text, *SkSL::GLSLCapsFactory::Default(), out)) { + if (!compiler.toGLSL(kind, text, SkSL::GLCaps(), out)) { printf("%s", compiler.errorText().c_str()); exit(3); } |