diff options
| author |  fmalita <fmalita@google.com> | 2016-09-30 08:05:24 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-09-30 08:05:24 -0700 |
| commit | d214d6ae69c1dd9ef49fdce8fac699d00bffcdcd (patch) | |
| tree | 96deebd7874fe2960416042011a999455d4f82e2 /tests/SkSLErrorTest.cpp | |
| parent | bc34404dc3feb4dac854aa43825646dd01139ccb (diff) | |
Revert of Turned on SkSL->GLSL compiler (patchset #41 id:880001 of https://codereview.chromium.org/2288033003/ )
Reason for revert:
1) Chromium roll failures: https://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_rel_ng/builds/307297/steps/screenshot_sync_tests%20on%20NVIDIA%20GPU%20on%20Linux%20%28with%20patch%29%20on%20Linux/logs/stdio
2) G3 roll failures
3) iOS failures: https://uberchromegw.corp.google.com/i/client.skia/builders/Perf-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release/builds/7177/steps/perf_skia%20on%20iOS-9.2/logs/stdio
Original issue's description:
> Turned on SkSL->GLSL compiler
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2288033003
>
> Committed: https://skia.googlesource.com/skia/+/9b0fe3d125f237d9884732a48414fa85fc71b4e3
> Committed: https://skia.googlesource.com/skia/+/b12b3c6908c62c908b3680be01e3b5bfd30de310
> Committed: https://skia.googlesource.com/skia/+/f008b0a59f45c0d4bea3e66faf3b01805009ec89
TBR=benjaminwagner@google.com,bsalomon@google.com,egdaniel@google.com,ethannicholas@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review-Url: https://codereview.chromium.org/2387643003
Diffstat (limited to 'tests/SkSLErrorTest.cpp')
| -rw-r--r-- | tests/SkSLErrorTest.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/SkSLErrorTest.cpp b/tests/SkSLErrorTest.cpp index 400ab6dc57..75fa20d7e3 100644 --- a/tests/SkSLErrorTest.cpp +++ b/tests/SkSLErrorTest.cpp @@ -263,8 +263,8 @@ DEF_TEST(SkSLBadIndex, r) { "void main() { int x = 2[0]; }", "error: 1: expected array, but found 'int'\n1 error\n"); test_failure(r, - "void main() { vec2 x = vec2(0); int y = x[0][0]; }", - "error: 1: expected array, but found 'float'\n1 error\n"); + "void main() { vec2 x = vec2(0); int y = x[0]; }", + "error: 1: expected array, but found 'vec2'\n1 error\n"); } DEF_TEST(SkSLTernaryMismatch, r) { |