commit c63f4313b449da6eef852610102ed737bea5e746
author Brian Osman <brianosman@google.com> Wed Dec 23 11:44:14 2020 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Dec 23 17:47:27 2020 +0000
tree b70c126ec9e1f6de604dc730c09407477f3fb677
parent ce613004a22f3b00aaacbcab90af80df072728db

SkSL: Hide non-square (half) matrices from runtime effects

Missed these when I moved the float versions earlier. Non-square
matrices don't exist in our minimum spec (GLSL ES 1.0).

Bug: skia:11093
Change-Id: I09b3ab71199bc70d9b54302c14b93bc3f3dec2d0
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/347042
Commit-Queue: John Stiles <johnstiles@google.com>
Reviewed-by: John Stiles <johnstiles@google.com>
Auto-Submit: Brian Osman <brianosman@google.com>

src/sksl/SkSLCompiler.cpp

diff --git a/src/sksl/SkSLCompiler.cpp b/src/sksl/SkSLCompiler.cpp
index 69de03f..3f1023de 100644
--- a/src/sksl/SkSLCompiler.cpp
+++ b/src/sksl/SkSLCompiler.cpp
@@ -111,15 +111,14 @@
         TYPE(  Bool), TYPE(  Bool2), TYPE(  Bool3), TYPE(  Bool4),
 
         TYPE(Float2x2), TYPE(Float3x3), TYPE(Float4x4),
+        TYPE( Half2x2), TYPE( Half3x3), TYPE(Half4x4),
 
-        TYPE(Half2x2),  TYPE(Half2x3),  TYPE(Half2x4),
-        TYPE(Half3x2),  TYPE(Half3x3),  TYPE(Half3x4),
-        TYPE(Half4x2),  TYPE(Half4x3),  TYPE(Half4x4),
+        TYPE(SquareMat), TYPE(SquareHMat),
 
         TYPE(GenType), TYPE(GenHType), TYPE(GenIType), TYPE(GenUType), TYPE(GenBType),
-        TYPE(SquareMat), TYPE(SquareHMat), TYPE(Vec),
-        TYPE(HVec), TYPE(IVec), TYPE(UVec), TYPE(SVec), TYPE(USVec),
-        TYPE(ByteVec), TYPE(UByteVec), TYPE(BVec),
+        TYPE(Vec),     TYPE(HVec),     TYPE(IVec),     TYPE(UVec),     TYPE(BVec),
+
+        TYPE(SVec), TYPE(USVec), TYPE(ByteVec), TYPE(UByteVec),
 
         TYPE(FragmentProcessor),
     };
@@ -129,6 +128,10 @@
         TYPE(Float3x2), TYPE(Float3x4),
         TYPE(Float4x2), TYPE(Float4x3),
 
+        TYPE(Half2x3),  TYPE(Half2x4),
+        TYPE(Half3x2),  TYPE(Half3x4),
+        TYPE(Half4x2),  TYPE(Half4x3),
+
         TYPE(Mat), TYPE(HMat),
 
         TYPE(Sampler1D), TYPE(Sampler2D), TYPE(Sampler3D),