diff options
| author |  Ethan Nicholas <ethannicholas@google.com> | 2017-09-11 13:50:14 -0700 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-09-11 21:45:20 +0000 |
| commit | 5b5f096a038259b8d9084834f877588a0db80250 (patch) | |
| tree | 1b78aa591c578a09012b1f8f8533c3fc3d9c1372 /src/sksl/ir/SkSLSwizzle.h | |
| parent | 9194706e8cf1ed72f07b2ed9207d81120f2135ad (diff) | |
Revert "Revert "Switch to the new SkSL lexer.""
This reverts commit 358515491a0d6891e6a709688a30ad087df1beb1.
Bug: skia:
Change-Id: I013fac0ed83774d8ae7c6ee6819045cab37f5e97
Reviewed-on: https://skia-review.googlesource.com/45180
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Diffstat (limited to 'src/sksl/ir/SkSLSwizzle.h')
| -rw-r--r-- | src/sksl/ir/SkSLSwizzle.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/sksl/ir/SkSLSwizzle.h b/src/sksl/ir/SkSLSwizzle.h index 9d7ca37bdc..3256ef211a 100644 --- a/src/sksl/ir/SkSLSwizzle.h +++ b/src/sksl/ir/SkSLSwizzle.h @@ -65,7 +65,7 @@ static const Type& get_type(const Context& context, Expression& value, size_t co */ struct Swizzle : public Expression { Swizzle(const Context& context, std::unique_ptr<Expression> base, std::vector<int> components) - : INHERITED(base->fPosition, kSwizzle_Kind, get_type(context, *base, components.size())) + : INHERITED(base->fOffset, kSwizzle_Kind, get_type(context, *base, components.size())) , fBase(std::move(base)) , fComponents(std::move(components)) { ASSERT(fComponents.size() >= 1 && fComponents.size() <= 4); @@ -80,13 +80,13 @@ struct Swizzle : public Expression { ASSERT(fComponents.size() == 1); int64_t value = ((Constructor&) *fBase).getIVecComponent(fComponents[0]); return std::unique_ptr<Expression>(new IntLiteral(irGenerator.fContext, - Position(), - value)); + -1, + value)); } else if (fType == *irGenerator.fContext.fFloat_Type) { ASSERT(fComponents.size() == 1); double value = ((Constructor&) *fBase).getFVecComponent(fComponents[0]); return std::unique_ptr<Expression>(new FloatLiteral(irGenerator.fContext, - Position(), + -1, value)); } } |