aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar Ethan Nicholas <ethannicholas@google.com>2018-03-20 16:30:34 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-03-21 14:34:28 +0000
commitd1d52562dd8fece9c27219830424a89606ff3eba (patch)
treef3f46c3775a05d0e9ff8b6f2572e05e6e462ae03 /src
parent471b6fe32a3e7c824e03a836c522531c4f9938f9 (diff)
fixed attributes of sk_InvocationID
Bug: skia: Change-Id: I549fdfa75f536e00f14bca445753f4c1354fa5d0 Reviewed-on: https://skia-review.googlesource.com/115361 Reviewed-by: Greg Daniel <egdaniel@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Diffstat (limited to 'src')
-rw-r--r--src/sksl/SkSLIRGenerator.cpp1
-rw-r--r--src/sksl/sksl_geom.inc2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/sksl/SkSLIRGenerator.cpp b/src/sksl/SkSLIRGenerator.cpp
index 8b508216ba..c6d09de7d5 100644
--- a/src/sksl/SkSLIRGenerator.cpp
+++ b/src/sksl/SkSLIRGenerator.cpp
@@ -327,6 +327,7 @@ std::unique_ptr<ModifiersDeclaration> IRGenerator::convertModifiersDeclaration(
modifiers.fLayout.fInvocations = -1;
Variable* invocationId = (Variable*) (*fSymbolTable)["sk_InvocationID"];
ASSERT(invocationId);
+ invocationId->fModifiers.fFlags = 0;
invocationId->fModifiers.fLayout.fBuiltin = -1;
if (modifiers.fLayout.description() == "") {
return nullptr;
diff --git a/src/sksl/sksl_geom.inc b/src/sksl/sksl_geom.inc
index dcd85f1aed..90c6c83663 100644
--- a/src/sksl/sksl_geom.inc
+++ b/src/sksl/sksl_geom.inc
@@ -14,7 +14,7 @@ layout(builtin=10007) out sk_PerVertex {
layout(builtin=3) float sk_ClipDistance[1];
};
-layout(builtin=8) int sk_InvocationID;
+layout(builtin=8) in int sk_InvocationID;
sk_has_side_effects void EmitStreamVertex(int stream);
sk_has_side_effects void EndStreamPrimitive(int stream);