commit ba7ef32832a416b90b146547936419921f16101c
author Brian Osman <brianosman@google.com> Tue Feb 23 13:37:22 2021 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Feb 24 14:02:34 2021 +0000
tree bc2a2460fc8e752474d30f458bceca0c6ecadb80
parent 743c697007a400fa13a170b9ed7495baac605427

SkSL: Simplify layout(key)

We had support for layout(key=identity), which added a bit to the key
depending on whether or not a matrix variable was identity. That feature
was unused - now 'key' is just a flag, rather than a separate enum.

Change-Id: I691a0b3683610f55e5d020b9cd6d9e414690bee6
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/374416
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: John Stiles <johnstiles@google.com>

src/sksl/SkSLRehydrator.cpp

diff --git a/src/sksl/SkSLRehydrator.cpp b/src/sksl/SkSLRehydrator.cpp
index 9d91666..55949d4 100644
--- a/src/sksl/SkSLRehydrator.cpp
+++ b/src/sksl/SkSLRehydrator.cpp
@@ -107,11 +107,10 @@
             int invocations = this->readS8();
             StringFragment marker = this->readString();
             StringFragment when = this->readString();
-            int key = this->readS8();
             int ctype = this->readS8();
             return Layout(flags, location, offset, binding, index, set, builtin,
                           inputAttachmentIndex, (Layout::Primitive)primitive, maxVertices,
-                          invocations, marker, when, (Layout::Key)key, (Layout::CType)ctype);
+                          invocations, marker, when, (Layout::CType)ctype);
         }
         default:
             SkASSERT(false);