Added positions to DSLParser layout processing
This allows for correct line number information in errors relating
to layouts.
Change-Id: I8df02f434d3565cb466074742780424b67ce4a8d
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/443240
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Reviewed-by: John Stiles <johnstiles@google.com>
diff --git a/src/sksl/SkSLDSLParser.cpp b/src/sksl/SkSLDSLParser.cpp
index c4477d6..3ca17e3 100644
--- a/src/sksl/SkSLDSLParser.cpp
+++ b/src/sksl/SkSLDSLParser.cpp
@@ -628,37 +628,37 @@
if (found != layoutTokens->end()) {
switch (found->second) {
case LayoutToken::ORIGIN_UPPER_LEFT:
- result.originUpperLeft();
+ result.originUpperLeft(this->position(t));
break;
case LayoutToken::PUSH_CONSTANT:
- result.pushConstant();
+ result.pushConstant(this->position(t));
break;
case LayoutToken::BLEND_SUPPORT_ALL_EQUATIONS:
- result.blendSupportAllEquations();
+ result.blendSupportAllEquations(this->position(t));
break;
case LayoutToken::SRGB_UNPREMUL:
- result.srgbUnpremul();
+ result.srgbUnpremul(this->position(t));
break;
case LayoutToken::LOCATION:
- result.location(this->layoutInt());
+ result.location(this->layoutInt(), this->position(t));
break;
case LayoutToken::OFFSET:
- result.offset(this->layoutInt());
+ result.offset(this->layoutInt(), this->position(t));
break;
case LayoutToken::BINDING:
- result.binding(this->layoutInt());
+ result.binding(this->layoutInt(), this->position(t));
break;
case LayoutToken::INDEX:
- result.index(this->layoutInt());
+ result.index(this->layoutInt(), this->position(t));
break;
case LayoutToken::SET:
- result.set(this->layoutInt());
+ result.set(this->layoutInt(), this->position(t));
break;
case LayoutToken::BUILTIN:
- result.builtin(this->layoutInt());
+ result.builtin(this->layoutInt(), this->position(t));
break;
case LayoutToken::INPUT_ATTACHMENT_INDEX:
- result.inputAttachmentIndex(this->layoutInt());
+ result.inputAttachmentIndex(this->layoutInt(), this->position(t));
break;
default:
this->error(t, "'" + text + "' is not a valid layout qualifier");