AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Brian Osman 2020-12-23 11:44:14 -05:00 committed by Skia Commit-Bot
parent ce613004a2
commit c63f4313b4
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/sksl/SkSLCompiler.cpp
View File

@ -111,15 +111,14 @@ Compiler::Compiler(const ShaderCapsClass* caps, Flags flags)
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 @@ Compiler::Compiler(const ShaderCapsClass* caps, Flags flags)
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),