AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
639e812d9f
skia2/tests/sksl/folding/MatrixFoldingES2.glsl

12 lines
341 B
Plaintext
Raw Normal View History

Update folding tests to return pass/fail status. A passing test returns solid green. Failing tests are written to return solid red, but drawing any other color than green can be interpreted as a test failure. Additionally, tests which cannot compile as RuntimeEffects (due to non-ES2-compatible features) have been split into an ES2-compatible part and an ES3 part. Change-Id: I3f53121d9de0ae4c4e7f1de3177d067811980b55 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/356999 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-01-22 14:51:13 +00:00
Support half4 return values from main() in the SPIR-V code generator. This creates a helper function, _entrypoint, which invokes main() and assigns its result into sk_FragColor. We also make sure to prevent sk_FragColor from being dead-stripped from the code during IR generation. At present this is useful for allowing our SkSL test shaders to compile. Change-Id: I2d7fab0e1959a77778ffdb18ca569e869bcaeece Reviewed-on: https://skia-review.googlesource.com/c/skia/+/358525 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-27 00:58:22 +00:00
out vec4 sk_FragColor;
Add helper uniforms to Runtime Effect tests. This lets us use descriptive names like `colorRed` and `colorGreen` instead of `half4(1,0,0,1)` and `half4(0,1,0,1)`. It also lets us use actual unknown values instead of synthesizing sorta-kinda-unknowns by calling sqrt. Change-Id: I61481c33b7ff42182955777b05cfa5fcc13e0efc Reviewed-on: https://skia-review.googlesource.com/c/skia/+/359567 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-01-26 21:28:12 +00:00
uniform vec4 colorRed;
uniform vec4 colorGreen;
Represent matrix resizes as a dedicated expression type. This shook out a long-standing bug; constant folding would treat a matrix resize as if the cells not covered by the original matrix were all zero. This is wrong; GLSL populates the unknown cells with an identity matrix. We actually tested for the wrong behavior, so the tests were updated to match the correct behavior, and an equivalent test was added that does not constant-fold (to verify that our constant folder matches reality). Change-Id: I03df10ce646fbef0a36e9c1a841a7637182de122 Bug: skia:11032 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/392916 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-04-06 17:47:19 +00:00
uniform float unknownInput;
Update folding tests to return pass/fail status. A passing test returns solid green. Failing tests are written to return solid red, but drawing any other color than green can be interpreted as a test failure. Additionally, tests which cannot compile as RuntimeEffects (due to non-ES2-compatible features) have been split into an ES2-compatible part and an ES3 part. Change-Id: I3f53121d9de0ae4c4e7f1de3177d067811980b55 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/356999 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-01-22 14:51:13 +00:00
vec4 main() {
Revert "Inline functions of the form 'return (expr)' only." This reverts commit 92748af1a5051e9fe329c8200f0fa3b47aadbdd7. Reason for revert: SkSLCommaSideEffects_GPU crashing on Android Original change's description: > Inline functions of the form 'return (expr)' only. > > This drastically reduces the number of functions which we allow to be > inlined. If this change does not hurt our performance, it will allow us > to trivially remove hundreds of LOC. All current data leads us to > believe that it may affect the Mali 400 but is highly unlikely to change > results on any other device in the tree. > > More info: http://go/optimization-in-sksl-inliner > > Change-Id: Ia6b706742ce5407453e0e697b6c1f9201084c0e8 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/384858 > Auto-Submit: John Stiles <johnstiles@google.com> > Commit-Queue: John Stiles <johnstiles@google.com> > Reviewed-by: Brian Osman <brianosman@google.com> > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com Change-Id: I6a670dacaa58fe3386ff50375ac6d1cac4fd7f2c No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/385161 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-03-15 22:08:38 +00:00
bool _0_ok = true;
Represent matrix resizes as a dedicated expression type. This shook out a long-standing bug; constant folding would treat a matrix resize as if the cells not covered by the original matrix were all zero. This is wrong; GLSL populates the unknown cells with an identity matrix. We actually tested for the wrong behavior, so the tests were updated to match the correct behavior, and an equivalent test was added that does not constant-fold (to verify that our constant folder matches reality). Change-Id: I03df10ce646fbef0a36e9c1a841a7637182de122 Bug: skia:11032 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/392916 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-04-06 17:47:19 +00:00
_0_ok = _0_ok && mat3(unknownInput) == mat3(mat2(1.0));
_0_ok = _0_ok && mat3(9.0, 0.0, 0.0, 0.0, 9.0, 0.0, 0.0, 0.0, unknownInput) == mat3(mat2(9.0));
Revert "Inline functions of the form 'return (expr)' only." This reverts commit 92748af1a5051e9fe329c8200f0fa3b47aadbdd7. Reason for revert: SkSLCommaSideEffects_GPU crashing on Android Original change's description: > Inline functions of the form 'return (expr)' only. > > This drastically reduces the number of functions which we allow to be > inlined. If this change does not hurt our performance, it will allow us > to trivially remove hundreds of LOC. All current data leads us to > believe that it may affect the Mali 400 but is highly unlikely to change > results on any other device in the tree. > > More info: http://go/optimization-in-sksl-inliner > > Change-Id: Ia6b706742ce5407453e0e697b6c1f9201084c0e8 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/384858 > Auto-Submit: John Stiles <johnstiles@google.com> > Commit-Queue: John Stiles <johnstiles@google.com> > Reviewed-by: Brian Osman <brianosman@google.com> > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com Change-Id: I6a670dacaa58fe3386ff50375ac6d1cac4fd7f2c No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/385161 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-03-15 22:08:38 +00:00
return _0_ok ? colorGreen : colorRed;
Update folding tests to return pass/fail status. A passing test returns solid green. Failing tests are written to return solid red, but drawing any other color than green can be interpreted as a test failure. Additionally, tests which cannot compile as RuntimeEffects (due to non-ES2-compatible features) have been split into an ES2-compatible part and an ES3 part. Change-Id: I3f53121d9de0ae4c4e7f1de3177d067811980b55 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/356999 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-01-22 14:51:13 +00:00
}
Reference in New Issue Copy Permalink