commit 8f1dff6a9e5480cbb173c996b522683178913f91
author Brian Osman <brianosman@google.com> Mon Apr 19 13:50:58 2021 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Apr 19 18:48:45 2021 +0000
tree 12b713a0aefc1d396d66495a2c079208468e4042
parent f6cc85844f15116ce9074acb90f3f262a77cb0e5

Remove layout(marker) from runtime effect SkSL

This is another strange, experimental feature that clutters the
implementation and isn't used by anyone (to my knowledge).

Change-Id: I538b7eca0cd28aab32f4739b23459731ade9105e
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/398226
Commit-Queue: John Stiles <johnstiles@google.com>
Reviewed-by: John Stiles <johnstiles@google.com>

src/sksl/codegen/SkSLSPIRVCodeGenerator.cpp

diff --git a/src/sksl/codegen/SkSLSPIRVCodeGenerator.cpp b/src/sksl/codegen/SkSLSPIRVCodeGenerator.cpp
index c00ef53..46d1515 100644
--- a/src/sksl/codegen/SkSLSPIRVCodeGenerator.cpp
+++ b/src/sksl/codegen/SkSLSPIRVCodeGenerator.cpp
@@ -2053,8 +2053,7 @@
                                          /*binding=*/-1, /*index=*/-1, /*set=*/-1, /*builtin=*/-1,
                                          /*inputAttachmentIndex=*/-1,
                                          Layout::kUnspecified_Primitive, /*maxVertices=*/1,
-                                         /*invocations=*/-1, /*marker=*/"", /*when=*/"",
-                                         Layout::CType::kDefault),
+                                         /*invocations=*/-1, /*when=*/"", Layout::CType::kDefault),
                                   /*flags=*/0),
                         SKSL_RTHEIGHT_NAME, fContext.fTypes.fFloat.get());
                 StringFragment name("sksl_synthetic_uniforms");
@@ -2074,7 +2073,7 @@
                         Layout(flags, /*location=*/-1, /*offset=*/-1, binding, /*index=*/-1,
                                set, /*builtin=*/-1, /*inputAttachmentIndex=*/-1,
                                Layout::kUnspecified_Primitive,
-                               /*maxVertices=*/-1, /*invocations=*/-1, /*marker=*/"", /*when=*/"",
+                               /*maxVertices=*/-1, /*invocations=*/-1, /*when=*/"",
                                Layout::CType::kDefault),
                         Modifiers::kUniform_Flag);
                 const Variable* intfVar = fSynthetics.takeOwnershipOfSymbol(