AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
f6cc85844f
skia2/tests/sksl/inliner/SwitchWithCastCanBeInlined.glsl

16 lines
287 B
Plaintext
Raw Normal View History

Migrate SkSL inliner tests to golden files. Our lack of proper caps-bits controls in skslc affects the outcome of one test: "InlinerWrapsEarlyReturnsWithDoWhileBlock" does not actually emit the do-while block because the standalone caps bits don't enable do-while support. This will be fixed in a followup CL that adds caps-bit support to our tests. A few tests were renamed for consistency, a few were simplified slightly and one test was removed because it was simply redundant (there was a second test that covered the exact same ground as `ForWithReturnInsideCannotBeInlined`). Change-Id: I2e3b97cb3aea331b6d806bdb865aa78c35c7a6b9 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/316997 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2020-09-15 14:10:43 +00:00
Align default values of GrShaderCaps with StandaloneShaderCaps. `fBuiltinFMASupport` is now true on both, and `fUsesPrecisionModifiers` is now false. Other mismatching flags exist, but they are non-trivial to synchronize as they are tied to extension strings. This will help our skslc-based unit tests generate the same results as our C++ unit tests did, but should not affect real-world results as these defaults will all be overwritten in a non-testing scenario. In practice, the `fUsesPrecisionModifiers` change is responsible for all of the diffs below. The other flags did not change the results of any of the currently-ported tests. Change-Id: Ieb056d852b027fa87c56fd89f971a77a10a8a124 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/317204 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-09-15 20:09:11 +00:00
out vec4 sk_FragColor;
uniform vec4 color;
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
void main() {
vec4 _0_result;
switch (int(color.x)) {
Avoid creating unnecessary scopes during inlining. The additional scopes were harmless, but didn't really add any value. Originally they were used to tightly scope inlined variables, but we now mangle inlined variable names. Change-Id: I7b35e737598036c0b6d3d9f71cbcd4a53d609ce9 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/344757 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2020-12-15 20:21:03 +00:00
case 1:
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
_0_result = color.yyyy;
Avoid creating unnecessary scopes during inlining. The additional scopes were harmless, but didn't really add any value. Originally they were used to tightly scope inlined variables, but we now mangle inlined variable names. Change-Id: I7b35e737598036c0b6d3d9f71cbcd4a53d609ce9 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/344757 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2020-12-15 20:21:03 +00:00
break;
default:
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
_0_result = color.zzzz;
Avoid creating unnecessary scopes during inlining. The additional scopes were harmless, but didn't really add any value. Originally they were used to tightly scope inlined variables, but we now mangle inlined variable names. Change-Id: I7b35e737598036c0b6d3d9f71cbcd4a53d609ce9 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/344757 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2020-12-15 20:21:03 +00:00
break;
Migrate SkSL inliner tests to golden files. Our lack of proper caps-bits controls in skslc affects the outcome of one test: "InlinerWrapsEarlyReturnsWithDoWhileBlock" does not actually emit the do-while block because the standalone caps bits don't enable do-while support. This will be fixed in a followup CL that adds caps-bit support to our tests. A few tests were renamed for consistency, a few were simplified slightly and one test was removed because it was simply redundant (there was a second test that covered the exact same ground as `ForWithReturnInsideCannotBeInlined`). Change-Id: I2e3b97cb3aea331b6d806bdb865aa78c35c7a6b9 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/316997 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2020-09-15 14:10:43 +00:00
}
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
sk_FragColor = _0_result;
Migrate SkSL inliner tests to golden files. Our lack of proper caps-bits controls in skslc affects the outcome of one test: "InlinerWrapsEarlyReturnsWithDoWhileBlock" does not actually emit the do-while block because the standalone caps bits don't enable do-while support. This will be fixed in a followup CL that adds caps-bit support to our tests. A few tests were renamed for consistency, a few were simplified slightly and one test was removed because it was simply redundant (there was a second test that covered the exact same ground as `ForWithReturnInsideCannotBeInlined`). Change-Id: I2e3b97cb3aea331b6d806bdb865aa78c35c7a6b9 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/316997 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2020-09-15 14:10:43 +00:00
}
Reference in New Issue Copy Permalink