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

41 lines
1.8 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;
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 half 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() {
bool ok = true;
ok = ok && (float2x2(float2(1.0, 0.0), float2(0.0, 1.0)) ==
float2x2(float2(1.0, 0.0), float2(0.0, 1.0)));
ok = ok && !(float2x2(float2(1.0, 0.0), float2(1.0, 1.0)) ==
float2x2(float2(1.0, 0.0), float2(0.0, 1.0)));
Create a diagonal-matrix Constructor class. This constructor takes a single argument and splats it diagonally across an otherwise-zero matrix. These are also sometimes referred to as a uniform-scale matrix. Change-Id: I1ed8140f55f5cad4029015807b220d6475401daa Bug: skia:11032 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/390716 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-03-31 02:09:37 +00:00
ok = ok && ( float2x2(1) == float2x2(1));
ok = ok && !( float2x2(1) == float2x2(0));
ok = ok && ( float2x2(-1) == -float2x2(1));
ok = ok && ( float2x2(0) == -float2x2(0));
ok = ok && (-float2x2(-1) == float2x2(1));
ok = ok && (-float2x2(0) == -float2x2(-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 && (float2x2(1) == float2x2(float2(1.0, 0.0), float2(0.0, 1.0)));
ok = ok && !(float2x2(2) == float2x2(float2(1.0, 0.0), float2(0.0, 1.0)));
ok = ok && !(float2x2(1) != float2x2(1));
ok = ok && (float2x2(1) != float2x2(0));
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
ok = ok && (float3x3(float3(1.0, 0.0, 0.0), float3(0.0, 1.0, 0.0), float3(0.0, 0.0, 1.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
float3x3(float2x2(1.0)));
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
ok = ok && (float3x3(float3(9.0, 0.0, 0.0), float3(0.0, 9.0, 0.0), float3(0.0, 0.0, 1.0)) ==
float3x3(float2x2(9.0)));
ok = ok && (float3x3(unknownInput) == float3x3(float2x2(1.0)));
ok = ok && (float3x3(float3(9).x00, float3(9).0x0, float3(unknownInput).00x) ==
float3x3(float2x2(9.0)));
ok = ok && (float2x2(float3x3(1.0)) == float2x2(1.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 && (float2x2(float3x3(1.0)) == float2x2(1.0));
ok = ok && (float2x2(float4(1.0, 0.0, 0.0, 1.0)) == float2x2(1.0));
ok = ok && (float2x2(1.0, 0.0, float2(0.0, 1.0)) == float2x2(1.0));
ok = ok && (float2x2(float2(1.0, 0.0), 0.0, 1.0) == float2x2(1.0));
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;
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