AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
b019e94c44
skia2/tests/sksl/errors/BooleanArithmetic.glsl

29 lines
1.5 KiB
Plaintext
Raw Normal View History

Detect invalid boolean binary expressions. GLSL does not allow most binary operations on bvec types; we can now detect these and properly flag them as errors. Note that `determine_binary_type` was also refactored. It originally started with an enormous omni-switch over every possible Token type, used to set various bools describing the type of binary expression at hand. Instead of one big switch, this has been refactored into several small switches in standalone functions that simply switch on the op and immediately return true or false. Conceptually this seems like more work (checking the op multiple times), but these tiny switches actually boil down to little branchless shift-and-mask functions, so in practice they should be quite efficient compared to the original omni-switch. Change-Id: I81b473d98c65da1edd136f35fc8f656261f8930d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/338346 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2020-11-25 15:21:55 +00:00
### Compilation failed:
Fix crash with boolean vectors in is_constant<T>. Previously, we assumed that if a vector in `is_constant` was not made of floats, it must be made of integers. This ignores that boolean vectors also exist. The original code would abort when `getIVecComponent` was called on a bool vector. There is another bug here--arithmetic operators on bool types should be disallowed entirely. That will be addressed in later CLs. Change-Id: I78781d839abde9376917fd92f2fe6311a1a58b02 Bug: oss-fuzz:27808 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/338055 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2020-11-24 17:04:47 +00:00
Disallow unary minus on boolean vectors. Previously, we allowed unary minus on numbers and vectors (of any type). Now, we allow them on numbers and vectors of numbers. Also updated the Boolean arithmetic error test to cover scalars as well as vectors. Change-Id: Ie74d1f3bfc1e9353e04c6f8e468fa20e0cbba16f Reviewed-on: https://skia-review.googlesource.com/c/skia/+/338396 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-11-25 16:09:03 +00:00
error: 1: type mismatch: '+' cannot operate on 'bool', 'bool'
error: 2: type mismatch: '-' cannot operate on 'bool', 'bool'
error: 3: type mismatch: '*' cannot operate on 'bool', 'bool'
error: 4: type mismatch: '/' cannot operate on 'bool', 'bool'
error: 5: type mismatch: '%' cannot operate on 'bool', 'bool'
error: 6: type mismatch: '<<' cannot operate on 'bool', 'bool'
error: 7: type mismatch: '>>' cannot operate on 'bool', 'bool'
error: 8: '-' cannot operate on 'bool'
error: 9: '~' cannot operate on 'bool'
error: 10: type mismatch: '&' cannot operate on 'bool', 'bool'
error: 11: type mismatch: '|' cannot operate on 'bool', 'bool'
error: 12: type mismatch: '^' cannot operate on 'bool', 'bool'
error: 14: type mismatch: '+' cannot operate on 'bool2', 'bool2'
error: 15: type mismatch: '-' cannot operate on 'bool2', 'bool2'
error: 16: type mismatch: '*' cannot operate on 'bool2', 'bool2'
error: 17: type mismatch: '/' cannot operate on 'bool2', 'bool2'
error: 18: type mismatch: '%' cannot operate on 'bool2', 'bool2'
error: 19: type mismatch: '<<' cannot operate on 'bool2', 'bool2'
error: 20: type mismatch: '>>' cannot operate on 'bool2', 'bool2'
error: 21: '!' cannot operate on 'bool2'
error: 22: '-' cannot operate on 'bool2'
error: 23: '~' cannot operate on 'bool2'
error: 24: type mismatch: '&' cannot operate on 'bool2', 'bool2'
error: 25: type mismatch: '|' cannot operate on 'bool2', 'bool2'
error: 26: type mismatch: '^' cannot operate on 'bool2', 'bool2'
25 errors
Reference in New Issue Copy Permalink