AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add test for sk_Caps.mustGuardDivisionEvenAfterExplicitZeroCheck.

Browse Source 
Change-Id: Ib1374e1dce1a654a83813dbe341774bd91729796
Bug: skia:10694, skia:10819
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/324356
Commit-Queue: John Stiles <johnstiles@google.com>
Auto-Submit: John Stiles <johnstiles@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
This commit is contained in:
John Stiles 2020-10-08 22:18:10 -04:00 committed by Skia Commit-Bot
parent 8f84cee9ab
commit eaaa71b705
6 changed files with 194 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gn/sksl_tests.gni
View File

@ -303,6 +303,7 @@ sksl_settings_tests = [
"$_tests/sksl/shared/Derivatives.sksl",
"$_tests/sksl/shared/DerivativesFlipY.sksl",
"$_tests/sksl/workarounds/AbsInt.sksl",
"$_tests/sksl/workarounds/BlendGuardedDivide.sksl",
"$_tests/sksl/workarounds/BlendModesAllZeroVec.sksl",
"$_tests/sksl/workarounds/FractNegative.sksl",
"$_tests/sksl/workarounds/FragCoords.sksl",

4
src/sksl/SkSLMain.cpp
View File

@ -125,6 +125,10 @@ static void detect_shader_settings(const SkSL::String& text, SkSL::Program::Sett
static auto s_incompleteShortIntCaps = Factory::IncompleteShortIntPrecision();
settings->fCaps = s_incompleteShortIntCaps.get();
}
if (settingsText.consumeSuffix(" MustGuardDivisionEvenAfterExplicitZeroCheck")) {
static auto s_div0Caps = Factory::MustGuardDivisionEvenAfterExplicitZeroCheck();
settings->fCaps = s_div0Caps.get();
}
if (settingsText.consumeSuffix(" MustForceNegatedAtanParamToFloat")) {
static auto s_negativeAtanCaps = Factory::MustForceNegatedAtanParamToFloat();
settings->fCaps = s_negativeAtanCaps.get();

6
src/sksl/SkSLUtil.h
View File

@ -390,6 +390,12 @@ public:
return result;
}
static ShaderCapsPointer MustGuardDivisionEvenAfterExplicitZeroCheck() {
ShaderCapsPointer result = MakeShaderCaps();
result->fMustGuardDivisionEvenAfterExplicitZeroCheck = true;
return result;
}
static ShaderCapsPointer NoGSInvocationsSupport() {
ShaderCapsPointer result = MakeShaderCaps();
result->fVersionDeclString = "#version 400";

9
tests/sksl/workarounds/BlendGuardedDivide.sksl Normal file
View File

@ -0,0 +1,9 @@
/*#pragma settings MustGuardDivisionEvenAfterExplicitZeroCheck*/
in half4 src, dst;
void main() {
sk_FragColor = blend_color_dodge(src, dst);
sk_FragColor = blend_color_burn(src, dst);
sk_FragColor = blend_soft_light(src, dst);
}

87
tests/sksl/workarounds/golden/BlendGuardedDivide.glsl Normal file
View File

@ -0,0 +1,87 @@
out vec4 sk_FragColor;
in vec4 src;
in vec4 dst;
float _color_dodge_component(vec2 s, vec2 d) {
if (d.x == 0.0) {
return s.x * (1.0 - d.y);
} else {
float delta = s.y - s.x;
if (delta == 0.0) {
return (s.y * d.y + s.x * (1.0 - d.y)) + d.x * (1.0 - s.y);
} else {
float _3_guarded_divide;
float _4_n = d.x * s.y;
{
_3_guarded_divide = _4_n / (delta + 9.9999999392252903e-09);
}
delta = min(d.y, _3_guarded_divide);
return (delta * s.y + s.x * (1.0 - d.y)) + d.x * (1.0 - s.y);
}
}
}
float _color_burn_component(vec2 s, vec2 d) {
if (d.y == d.x) {
return (s.y * d.y + s.x * (1.0 - d.y)) + d.x * (1.0 - s.y);
} else if (s.x == 0.0) {
return d.x * (1.0 - s.y);
} else {
float _5_guarded_divide;
float _6_n = (d.y - d.x) * s.y;
{
_5_guarded_divide = _6_n / (s.x + 9.9999999392252903e-09);
}
float delta = max(0.0, d.y - _5_guarded_divide);
return (delta * s.y + s.x * (1.0 - d.y)) + d.x * (1.0 - s.y);
}
}
float _soft_light_component(vec2 s, vec2 d) {
if (2.0 * s.x <= s.y) {
float _7_guarded_divide;
float _8_n = (d.x * d.x) * (s.y - 2.0 * s.x);
{
_7_guarded_divide = _8_n / (d.y + 9.9999999392252903e-09);
}
return (_7_guarded_divide + (1.0 - d.y) * s.x) + d.x * ((-s.y + 2.0 * s.x) + 1.0);
} else if (4.0 * d.x <= d.y) {
float DSqd = d.x * d.x;
float DCub = DSqd * d.x;
float DaSqd = d.y * d.y;
float DaCub = DaSqd * d.y;
float _9_guarded_divide;
float _10_n = ((DaSqd * (s.x - d.x * ((3.0 * s.y - 6.0 * s.x) - 1.0)) + ((12.0 * d.y) * DSqd) * (s.y - 2.0 * s.x)) - (16.0 * DCub) * (s.y - 2.0 * s.x)) - DaCub * s.x;
{
_9_guarded_divide = _10_n / (DaSqd + 9.9999999392252903e-09);
}
return _9_guarded_divide;
} else {
return ((d.x * ((s.y - 2.0 * s.x) + 1.0) + s.x) - sqrt(d.y * d.x) * (s.y - 2.0 * s.x)) - d.y * s.x;
}
}
void main() {
vec4 _0_blend_color_dodge;
{
_0_blend_color_dodge = vec4(_color_dodge_component(src.xw, dst.xw), _color_dodge_component(src.yw, dst.yw), _color_dodge_component(src.zw, dst.zw), src.w + (1.0 - src.w) * dst.w);
}
sk_FragColor = _0_blend_color_dodge;
vec4 _1_blend_color_burn;
{
_1_blend_color_burn = vec4(_color_burn_component(src.xw, dst.xw), _color_burn_component(src.yw, dst.yw), _color_burn_component(src.zw, dst.zw), src.w + (1.0 - src.w) * dst.w);
}
sk_FragColor = _1_blend_color_burn;
vec4 _2_blend_soft_light;
{
_2_blend_soft_light = dst.w == 0.0 ? src : vec4(_soft_light_component(src.xw, dst.xw), _soft_light_component(src.yw, dst.yw), _soft_light_component(src.zw, dst.zw), src.w + (1.0 - src.w) * dst.w);
}
sk_FragColor = _2_blend_soft_light;
}

87
tests/sksl/workarounds/golden/BlendGuardedDivideStandaloneSettings.glsl Normal file
View File

@ -0,0 +1,87 @@
out vec4 sk_FragColor;
in vec4 src;
in vec4 dst;
float _color_dodge_component(vec2 s, vec2 d) {
if (d.x == 0.0) {
return s.x * (1.0 - d.y);
} else {
float delta = s.y - s.x;
if (delta == 0.0) {
return (s.y * d.y + s.x * (1.0 - d.y)) + d.x * (1.0 - s.y);
} else {
float _3_guarded_divide;
float _4_n = d.x * s.y;
{
_3_guarded_divide = _4_n / delta;
}
delta = min(d.y, _3_guarded_divide);
return (delta * s.y + s.x * (1.0 - d.y)) + d.x * (1.0 - s.y);
}
}
}
float _color_burn_component(vec2 s, vec2 d) {
if (d.y == d.x) {
return (s.y * d.y + s.x * (1.0 - d.y)) + d.x * (1.0 - s.y);
} else if (s.x == 0.0) {
return d.x * (1.0 - s.y);
} else {
float _5_guarded_divide;
float _6_n = (d.y - d.x) * s.y;
{
_5_guarded_divide = _6_n / s.x;
}
float delta = max(0.0, d.y - _5_guarded_divide);
return (delta * s.y + s.x * (1.0 - d.y)) + d.x * (1.0 - s.y);
}
}
float _soft_light_component(vec2 s, vec2 d) {
if (2.0 * s.x <= s.y) {
float _7_guarded_divide;
float _8_n = (d.x * d.x) * (s.y - 2.0 * s.x);
{
_7_guarded_divide = _8_n / d.y;
}
return (_7_guarded_divide + (1.0 - d.y) * s.x) + d.x * ((-s.y + 2.0 * s.x) + 1.0);
} else if (4.0 * d.x <= d.y) {
float DSqd = d.x * d.x;
float DCub = DSqd * d.x;
float DaSqd = d.y * d.y;
float DaCub = DaSqd * d.y;
float _9_guarded_divide;
float _10_n = ((DaSqd * (s.x - d.x * ((3.0 * s.y - 6.0 * s.x) - 1.0)) + ((12.0 * d.y) * DSqd) * (s.y - 2.0 * s.x)) - (16.0 * DCub) * (s.y - 2.0 * s.x)) - DaCub * s.x;
{
_9_guarded_divide = _10_n / DaSqd;
}
return _9_guarded_divide;
} else {
return ((d.x * ((s.y - 2.0 * s.x) + 1.0) + s.x) - sqrt(d.y * d.x) * (s.y - 2.0 * s.x)) - d.y * s.x;
}
}
void main() {
vec4 _0_blend_color_dodge;
{
_0_blend_color_dodge = vec4(_color_dodge_component(src.xw, dst.xw), _color_dodge_component(src.yw, dst.yw), _color_dodge_component(src.zw, dst.zw), src.w + (1.0 - src.w) * dst.w);
}
sk_FragColor = _0_blend_color_dodge;
vec4 _1_blend_color_burn;
{
_1_blend_color_burn = vec4(_color_burn_component(src.xw, dst.xw), _color_burn_component(src.yw, dst.yw), _color_burn_component(src.zw, dst.zw), src.w + (1.0 - src.w) * dst.w);
}
sk_FragColor = _1_blend_color_burn;
vec4 _2_blend_soft_light;
{
_2_blend_soft_light = dst.w == 0.0 ? src : vec4(_soft_light_component(src.xw, dst.xw), _soft_light_component(src.yw, dst.yw), _soft_light_component(src.zw, dst.zw), src.w + (1.0 - src.w) * dst.w);
}
sk_FragColor = _2_blend_soft_light;
}