commit b1e9cb08c13015b0b00a4eae160811b8e4999a43
author Brian Osman <brianosman@google.com> Fri May 21 12:03:51 2021 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri May 21 18:04:03 2021 +0000
tree 8a8732132341e50559c8a6a5a57cb64cd1a9cd4c
parent 50cc5d4147c94505b7fb17eeb8d04027029bbd15

Remove fExpression (matrix expression) from SampleUsage

Other than GMs, there is exactly one use of matrix-sampling
(GrMatrixEffect). It is always uniform (not literal or an
expression containing a uniform). The uniform always has the
same name. Bake these simplifications in, which also shrinks
SampleUsage quite a bit.

Change-Id: I0d5e32069d710af475ccc1030e2988c5fc965a98
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/411296
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>

src/sksl/SkSLSampleUsage.cpp

diff --git a/src/sksl/SkSLSampleUsage.cpp b/src/sksl/SkSLSampleUsage.cpp
index 9374a95..a398728 100644
--- a/src/sksl/SkSLSampleUsage.cpp
+++ b/src/sksl/SkSLSampleUsage.cpp
@@ -7,24 +7,7 @@
 
 #include "include/private/SkSLSampleUsage.h"
 
-#include "src/sksl/ir/SkSLBinaryExpression.h"
-#include "src/sksl/ir/SkSLConstructor.h"
-#include "src/sksl/ir/SkSLDoStatement.h"
-#include "src/sksl/ir/SkSLExpression.h"
-#include "src/sksl/ir/SkSLExpressionStatement.h"
-#include "src/sksl/ir/SkSLFieldAccess.h"
-#include "src/sksl/ir/SkSLForStatement.h"
-#include "src/sksl/ir/SkSLFunctionCall.h"
-#include "src/sksl/ir/SkSLIfStatement.h"
-#include "src/sksl/ir/SkSLIndexExpression.h"
-#include "src/sksl/ir/SkSLPostfixExpression.h"
-#include "src/sksl/ir/SkSLPrefixExpression.h"
-#include "src/sksl/ir/SkSLProgram.h"
-#include "src/sksl/ir/SkSLReturnStatement.h"
-#include "src/sksl/ir/SkSLSwitchStatement.h"
-#include "src/sksl/ir/SkSLSwizzle.h"
-#include "src/sksl/ir/SkSLTernaryExpression.h"
-#include "src/sksl/ir/SkSLVariable.h"
+#include <algorithm>
 
 namespace SkSL {