AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
c4c355940c
skia2/resources/sksl/folding/FloatFolding.sksl

83 lines
1.9 KiB
Plaintext
Raw Normal View History

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 half4 colorRed, colorGreen;
Remove usage of sqrt() as an optimization barrier in tests. In the majority of cases, a uniform is an equally good substitute, and replacing `sqrt(N)` with `unknownInput` actually makes the test clearer. Change-Id: I7bcb477571972d7aa2ce8c49b3674471f7310748 Bug: skia:12034 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/411306 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-05-24 14:52:23 +00:00
uniform float unknownInput;
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
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
bool test() {
Remove usage of sqrt() as an optimization barrier in tests. In the majority of cases, a uniform is an equally good substitute, and replacing `sqrt(N)` with `unknownInput` actually makes the test clearer. Change-Id: I7bcb477571972d7aa2ce8c49b3674471f7310748 Bug: skia:12034 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/411306 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-05-24 14:52:23 +00:00
half unknown = half(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
bool ok = true;
half x = 32.0 + 2.0;
ok = ok && (x == 34);
x = 32.0 - 2.0;
ok = ok && (x == 30);
x = 32.0 * 2.0;
ok = ok && (x == 64);
x = 32.0 / 2.0;
ok = ok && (x == 16);
x = (12 > 2.0) ? (10 * 2 / 5 + 18 - 3) : 0;
ok = ok && (x == 19);
x = 0.0 == 0.0 ? 1 : -1;
ok = ok && (x == 1);
x = 0.0 == 1.0 ? 2 : -2;
ok = ok && (x == -2);
x = 0.0 != 1.0 ? 3 : -3;
ok = ok && (x == 3);
x = 0.0 != 0.0 ? 4 : -4;
ok = ok && (x == -4);
x = 6.0 > 5.0 ? 5 : -5;
ok = ok && (x == 5);
x = 6.0 > 6.0 ? 6 : -6;
ok = ok && (x == -6);
x = 6.0 >= 6.0 ? 7 : -7;
ok = ok && (x == 7);
x = 6.0 >= 7.0 ? 8 : -8;
ok = ok && (x == -8);
x = 5.0 < 6.0 ? 9 : -9;
ok = ok && (x == 9);
x = 6.0 < 6.0 ? 10 : -10;
ok = ok && (x == -10);
x = 6.0 <= 6.0 ? 11 : -11;
ok = ok && (x == 11);
x = 6.0 <= 5.0 ? 12 : -12;
ok = ok && (x == -12);
Avoid relying on bit-perfect irrational numbers in test code. Comparing sqrt(5) against a variable containing sqrt(5) was not working properly in some versions of Android running Vulkan. Change-Id: I4f6bbff78a9ba56ec6e222f2037d66b13e3cd635 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/358530 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-25 18:04:12 +00:00
x = half(unknown + 0);
ok = ok && (x == unknown);
x = half(0 + unknown);
ok = ok && (x == unknown);
x = half(unknown - 0);
ok = ok && (x == unknown);
x = half(unknown * 0);
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
ok = ok && (x == 0);
Avoid relying on bit-perfect irrational numbers in test code. Comparing sqrt(5) against a variable containing sqrt(5) was not working properly in some versions of Android running Vulkan. Change-Id: I4f6bbff78a9ba56ec6e222f2037d66b13e3cd635 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/358530 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-25 18:04:12 +00:00
x = half(unknown * 1);
ok = ok && (x == unknown);
x = half(1 * unknown);
ok = ok && (x == unknown);
x = half(0 * unknown);
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
ok = ok && (x == 0);
Avoid relying on bit-perfect irrational numbers in test code. Comparing sqrt(5) against a variable containing sqrt(5) was not working properly in some versions of Android running Vulkan. Change-Id: I4f6bbff78a9ba56ec6e222f2037d66b13e3cd635 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/358530 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-25 18:04:12 +00:00
x = half(unknown / 1);
ok = ok && (x == unknown);
Remove 0/x arithmetic simplification. If x is a known compile-time constant value, it can already be optimized to a final value. If x is not known, it could be zero, and 0/0 should result in a NaN. Change-Id: I643a7c6da0a43ec366235c4df39fc78d3b361de7 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/441580 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-08-24 18:13:16 +00:00
x = half(0 / unknown); // this should NOT optimize away
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
ok = ok && (x == 0);
Remove usage of sqrt() as an optimization barrier in tests. In the majority of cases, a uniform is an equally good substitute, and replacing `sqrt(N)` with `unknownInput` actually makes the test clearer. Change-Id: I7bcb477571972d7aa2ce8c49b3674471f7310748 Bug: skia:12034 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/411306 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-05-24 14:52:23 +00:00
x += 1;
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
ok = ok && (x == 1);
x += 0;
ok = ok && (x == 1);
x -= 2;
ok = ok && (x == -1);
x -= 0;
ok = ok && (x == -1);
x *= 1;
ok = ok && (x == -1);
x *= 2;
ok = ok && (x == -2);
x /= 1;
ok = ok && (x == -2);
x /= 2;
ok = ok && (x == -1);
return ok;
}
Reland "Add coords parameter to all .sksl test files used as runtime effects" This is a reland of 22dcb5fd7e4ab2a7a1a827165899a54342d2ed53 Original change's description: > Add coords parameter to all .sksl test files used as runtime effects > > Convert to use the newer MakeForShader factory, which requires this. > > Change-Id: Ifaf6054054027c78f3f3fe15596e435e0f79b877 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/399336 > Commit-Queue: Brian Osman <brianosman@google.com> > Reviewed-by: John Stiles <johnstiles@google.com> Bug: skia:11919 Change-Id: I5f745c54b2bc3712f2281db6e067345903e81931 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/401836 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2021-04-21 18:27:08 +00:00
half4 main(float2 coords) {
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
return test() ? colorGreen : colorRed;
Convert several SkSL->GLSL unit tests to golden outputs. The new test files are intended to be identical to the unit tests in every meaningful way. (Comments and formatting are not preserved exactly.) In cases where a unit-test method contained more than one test, multiple test files were created; in these cases, new names were invented to match the apparent intent of each invocation. Followup CLs will continue to migrate additional tests. Change-Id: I785c6761ba7ee2b25b5ddc0108321734be23b77c Bug: skia:10694 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/316678 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-09-14 21:30:13 +00:00
}
Reference in New Issue Copy Permalink