diff options
author | ethannicholas <ethannicholas@google.com> | 2016-09-26 13:43:47 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-09-26 13:43:47 -0700 |
commit | 29111a3e71f59b26c1feebf6b30db5c68a27d5a9 (patch) | |
tree | f0adeb3061610aed50cff350f528d0a952f63c0a /tests/SkSLErrorTest.cpp | |
parent | 2cc7f8d196793a8a7f8d50b104f733f9a476788c (diff) |
Revert of Turned on SkSL->GLSL compiler (patchset #37 id:800001 of https://codereview.chromium.org/2288033003/ )
Reason for revert:
Gold image breakage
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
TBR=benjaminwagner@google.com,bsalomon@google.com,egdaniel@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/2372773002
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) { |