diff options
| author |  Leon Scroggins <scroggo@google.com> | 2016-11-11 15:50:45 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-11-11 15:51:01 +0000 |
| commit | b0b5360ae4078560b2f5f8508471129e4dd1cee6 (patch) | |
| tree | 20b240c09f4d833fbd6f80f7dbce8447b5221f42 /src/sksl/SkSLMain.cpp | |
| parent | 8af38a96475ac5ce83b20c16d9cf82bf1006b8c4 (diff) | |
Revert "skslc now uses standard Skia caps"
This reverts commit 8af38a96475ac5ce83b20c16d9cf82bf1006b8c4.
Reason for revert: Breaking compile bots, e.g. from https://uberchromegw.corp.google.com/i/client.skia.compile/builders/Build-Ubuntu-GCC-x86_64-Debug-NoGPU/builds/10029/steps/compile_skia%20on%20Ubuntu/logs/stdio :
In function `sk_make_sp<GrGLSLCaps, GrContextOptions>'
undefined reference to `GrGLSLCaps::GrGLSLCaps(GrContextOptions const&)
In function `_Z10sk_make_spI10GrGLSLCapsI16GrContextOptionsEE5sk_spIT_EDpOT0_':
undefined reference to `GrGLSLCaps::GrGLSLCaps(GrContextOptions const&)
Original change's description:
> skslc now uses standard Skia caps
>
> BUG=skia:
>
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4660
>
> Change-Id: Idaedae3f81426b97f5052bb872cdf0610e47a84f
> Reviewed-on: https://skia-review.googlesource.com/4660
> Reviewed-by: Ben Wagner <benjaminwagner@google.com>
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
>
TBR=bsalomon@google.com,benjaminwagner@google.com,ethannicholas@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: Ic7f987f5c050ac2e333f5a0f16c8de85c1047a74
Reviewed-on: https://skia-review.googlesource.com/4697
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); } |