michael/pathfinder
michael
/
pathfinder
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Auto merge of #414 - pcwalton:radial-gradient-epsilon, r=pcwalton 

Allow radial gradients to be evaluated with any nonzero discriminant, not just ones with magnitude above `EPSILON`.

Closes #399.
This commit is contained in:
bors-servo 2020-07-23 16:47:01 -04:00 committed by GitHub
parent 536cb4c093 0e82acda2b
commit a05270f0a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 79 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
resources/shaders/gl3/d3d9/tile.fs.glsl
View File

@ -92,8 +92,6 @@ precision highp float;
@ -315,7 +313,7 @@ vec4 filterRadialGradient(vec2 colorTexCoord,
float discrim = b * b - a * c;
vec4 color = vec4(0.0);
if(abs(discrim)>= 0.00001){
if(discrim != 0.0){
vec2 ts = vec2(sqrt(discrim)* vec2(1.0, - 1.0)+ vec2(b))/ vec2(a);
if(ts . x > ts . y)
ts = ts . yx;

4
resources/shaders/gl4/d3d11/tile.cs.glsl
View File

@ -94,8 +94,6 @@ layout(local_size_x = 16, local_size_y = 4)in;
@ -317,7 +315,7 @@ vec4 filterRadialGradient(vec2 colorTexCoord,
float discrim = b * b - a * c;
vec4 color = vec4(0.0);
if(abs(discrim)>= 0.00001){
if(discrim != 0.0){
vec2 ts = vec2(sqrt(discrim)* vec2(1.0, - 1.0)+ vec2(b))/ vec2(a);
if(ts . x > ts . y)
ts = ts . yx;

4
resources/shaders/gl4/d3d9/tile.fs.glsl
View File

@ -92,8 +92,6 @@ precision highp float;
@ -315,7 +313,7 @@ vec4 filterRadialGradient(vec2 colorTexCoord,
float discrim = b * b - a * c;
vec4 color = vec4(0.0);
if(abs(discrim)>= 0.00001){
if(discrim != 0.0){
vec2 ts = vec2(sqrt(discrim)* vec2(1.0, - 1.0)+ vec2(b))/ vec2(a);
if(ts . x > ts . y)
ts = ts . yx;

80
resources/shaders/metal/d3d11/tile.cs.metal
View File

@ -18,7 +18,7 @@ struct bTiles
constant uint3 gl_WorkGroupSize [[maybe_unused]] = uint3(16u, 4u, 1u);
constant float3 _1151 = {};
constant float3 _1149 = {};
// Implementation of the GLSL mod() function, which is slightly different than Metal fmod()
template<typename Tx, typename Ty>
@ -126,23 +126,23 @@ float4 filterRadialGradient(thread const float2& colorTexCoord, thread const tex
float c = dot(dP, dP) - (radii.x * radii.x);
float discrim = (b * b) - (a * c);
float4 color = float4(0.0);
if (abs(discrim) >= 9.9999997473787516355514526367188e-06)
if (discrim != 0.0)
{
float2 ts = float2((float2(1.0, -1.0) * sqrt(discrim)) + float2(b)) / float2(a);
if (ts.x > ts.y)
{
ts = ts.yx;
}
float _611;
float _609;
if (ts.x >= 0.0)
{
_611 = ts.x;
_609 = ts.x;
}
else
{
_611 = ts.y;
_609 = ts.y;
}
float t = _611;
float t = _609;
color = colorTexture.sample(colorTextureSmplr, (uvOrigin + float2(t, 0.0)), level(0.0));
}
return color;
@ -156,19 +156,19 @@ float4 filterBlur(thread const float2& colorTexCoord, thread const texture2d<flo
float3 gaussCoeff = filterParams1.xyz;
float gaussSum = gaussCoeff.x;
float4 color = colorTexture.sample(colorTextureSmplr, colorTexCoord, level(0.0)) * gaussCoeff.x;
float2 _655 = gaussCoeff.xy * gaussCoeff.yz;
gaussCoeff = float3(_655.x, _655.y, gaussCoeff.z);
float2 _653 = gaussCoeff.xy * gaussCoeff.yz;
gaussCoeff = float3(_653.x, _653.y, gaussCoeff.z);
for (int i = 1; i <= support; i += 2)
{
float gaussPartialSum = gaussCoeff.x;
float2 _675 = gaussCoeff.xy * gaussCoeff.yz;
gaussCoeff = float3(_675.x, _675.y, gaussCoeff.z);
float2 _673 = gaussCoeff.xy * gaussCoeff.yz;
gaussCoeff = float3(_673.x, _673.y, gaussCoeff.z);
gaussPartialSum += gaussCoeff.x;
float2 srcOffset = srcOffsetScale * (float(i) + (gaussCoeff.x / gaussPartialSum));
color += ((colorTexture.sample(colorTextureSmplr, (colorTexCoord - srcOffset), level(0.0)) + colorTexture.sample(colorTextureSmplr, (colorTexCoord + srcOffset), level(0.0))) * gaussPartialSum);
gaussSum += (2.0 * gaussPartialSum);
float2 _715 = gaussCoeff.xy * gaussCoeff.yz;
gaussCoeff = float3(_715.x, _715.y, gaussCoeff.z);
float2 _713 = gaussCoeff.xy * gaussCoeff.yz;
gaussCoeff = float3(_713.x, _713.y, gaussCoeff.z);
}
return color / float4(gaussSum);
}
@ -389,34 +389,34 @@ float3 compositeScreen(thread const float3& destColor, thread const float3& srcC
static inline __attribute__((always_inline))
float3 compositeSelect(thread const bool3& cond, thread const float3& ifTrue, thread const float3& ifFalse)
{
float _835;
float _833;
if (cond.x)
{
_835 = ifTrue.x;
_833 = ifTrue.x;
}
else
{
_835 = ifFalse.x;
_833 = ifFalse.x;
}
float _846;
float _844;
if (cond.y)
{
_846 = ifTrue.y;
_844 = ifTrue.y;
}
else
{
_846 = ifFalse.y;
_844 = ifFalse.y;
}
float _857;
float _855;
if (cond.z)
{
_857 = ifTrue.z;
_855 = ifTrue.z;
}
else
{
_857 = ifFalse.z;
_855 = ifFalse.z;
}
return float3(_835, _846, _857);
return float3(_833, _844, _855);
}
static inline __attribute__((always_inline))
@ -461,16 +461,16 @@ float3 compositeSoftLight(thread const float3& destColor, thread const float3& s
static inline __attribute__((always_inline))
float compositeDivide(thread const float& num, thread const float& denom)
{
float _871;
float _869;
if (denom != 0.0)
{
_871 = num / denom;
_869 = num / denom;
}
else
{
_871 = 0.0;
_869 = 0.0;
}
return _871;
return _869;
}
static inline __attribute__((always_inline))
@ -480,25 +480,25 @@ float3 compositeRGBToHSL(thread const float3& rgb)
float xMin = fast::min(fast::min(rgb.x, rgb.y), rgb.z);
float c = v - xMin;
float l = mix(xMin, v, 0.5);
float3 _977;
float3 _975;
if (rgb.x == v)
{
_977 = float3(0.0, rgb.yz);
_975 = float3(0.0, rgb.yz);
}
else
{
float3 _990;
float3 _988;
if (rgb.y == v)
{
_990 = float3(2.0, rgb.zx);
_988 = float3(2.0, rgb.zx);
}
else
{
_990 = float3(4.0, rgb.xy);
_988 = float3(4.0, rgb.xy);
}
_977 = _990;
_975 = _988;
}
float3 terms = _977;
float3 terms = _975;
float param = ((terms.x * c) + terms.y) - terms.z;
float param_1 = c;
float h = 1.0471975803375244140625 * compositeDivide(param, param_1);
@ -672,17 +672,17 @@ float4 calculateColor(thread const float2& fragCoord, thread const texture2d<flo
float2 param_19 = fragCoord;
int param_20 = compositeOp;
color = composite(param_17, destTexture, destTextureSmplr, param_18, param_19, param_20);
float3 _1437 = color.xyz * color.w;
color = float4(_1437.x, _1437.y, _1437.z, color.w);
float3 _1435 = color.xyz * color.w;
color = float4(_1435.x, _1435.y, _1435.z, color.w);
return color;
}
kernel void main0(constant int2& uFramebufferTileSize [[buffer(3)]], constant int& uLoadAction [[buffer(4)]], constant int2& uTextureMetadataSize [[buffer(7)]], constant float2& uFramebufferSize [[buffer(0)]], constant float2& uTileSize [[buffer(1)]], constant float4& uClearColor [[buffer(5)]], constant float2& uColorTextureSize0 [[buffer(8)]], constant float2& uMaskTextureSize0 [[buffer(9)]], const device bFirstTileMap& _1601 [[buffer(2)]], const device bTiles& _1692 [[buffer(6)]], texture2d<float, access::read_write> uDestImage [[texture(0)]], texture2d<float> uTextureMetadata [[texture(1)]], texture2d<float> uColorTexture0 [[texture(2)]], texture2d<float> uMaskTexture0 [[texture(3)]], texture2d<float> uGammaLUT [[texture(4)]], sampler uTextureMetadataSmplr [[sampler(0)]], sampler uColorTexture0Smplr [[sampler(1)]], sampler uMaskTexture0Smplr [[sampler(2)]], sampler uGammaLUTSmplr [[sampler(3)]], uint3 gl_WorkGroupID [[threadgroup_position_in_grid]], uint3 gl_LocalInvocationID [[thread_position_in_threadgroup]])
kernel void main0(constant int2& uFramebufferTileSize [[buffer(3)]], constant int& uLoadAction [[buffer(4)]], constant int2& uTextureMetadataSize [[buffer(7)]], constant float2& uFramebufferSize [[buffer(0)]], constant float2& uTileSize [[buffer(1)]], constant float4& uClearColor [[buffer(5)]], constant float2& uColorTextureSize0 [[buffer(8)]], constant float2& uMaskTextureSize0 [[buffer(9)]], const device bFirstTileMap& _1599 [[buffer(2)]], const device bTiles& _1690 [[buffer(6)]], texture2d<float, access::read_write> uDestImage [[texture(0)]], texture2d<float> uTextureMetadata [[texture(1)]], texture2d<float> uColorTexture0 [[texture(2)]], texture2d<float> uMaskTexture0 [[texture(3)]], texture2d<float> uGammaLUT [[texture(4)]], sampler uTextureMetadataSmplr [[sampler(0)]], sampler uColorTexture0Smplr [[sampler(1)]], sampler uMaskTexture0Smplr [[sampler(2)]], sampler uGammaLUTSmplr [[sampler(3)]], uint3 gl_WorkGroupID [[threadgroup_position_in_grid]], uint3 gl_LocalInvocationID [[thread_position_in_threadgroup]])
{
int2 tileCoord = int2(gl_WorkGroupID.xy);
int2 firstTileSubCoord = int2(gl_LocalInvocationID.xy) * int2(1, 4);
int2 firstFragCoord = (tileCoord * int2(uTileSize)) + firstTileSubCoord;
int tileIndex = _1601.iFirstTileMap[tileCoord.x + (uFramebufferTileSize.x * tileCoord.y)];
int tileIndex = _1599.iFirstTileMap[tileCoord.x + (uFramebufferTileSize.x * tileCoord.y)];
if ((tileIndex < 0) && (uLoadAction != 0))
{
return;
@ -717,8 +717,8 @@ kernel void main0(constant int2& uFramebufferTileSize [[buffer(3)]], constant in
{
int2 tileSubCoord = firstTileSubCoord + int2(0, subY_1);
float2 fragCoord = float2(firstFragCoord + int2(0, subY_1)) + float2(0.5);
int alphaTileIndex = int(_1692.iTiles[(tileIndex * 4) + 2] << uint(8)) >> 8;
uint tileControlWord = _1692.iTiles[(tileIndex * 4) + 3];
int alphaTileIndex = int(_1690.iTiles[(tileIndex * 4) + 2] << uint(8)) >> 8;
uint tileControlWord = _1690.iTiles[(tileIndex * 4) + 3];
uint colorEntry = tileControlWord & 65535u;
int tileCtrl = int((tileControlWord >> uint(16)) & 255u);
if (alphaTileIndex >= 0)
@ -762,7 +762,7 @@ kernel void main0(constant int2& uFramebufferTileSize [[buffer(3)]], constant in
float4 srcColor = calculateColor(param_12, uColorTexture0, uColorTexture0Smplr, uMaskTexture0, uMaskTexture0Smplr, uColorTexture0, uColorTexture0Smplr, uGammaLUT, uGammaLUTSmplr, param_13, param_14, param_15, param_16, param_17, param_18, param_19, param_20, param_21, param_22, param_23, param_24, param_25);
destColors[subY_1] = (destColors[subY_1] * (1.0 - srcColor.w)) + srcColor;
}
tileIndex = int(_1692.iTiles[(tileIndex * 4) + 0]);
tileIndex = int(_1690.iTiles[(tileIndex * 4) + 0]);
}
for (int subY_2 = 0; subY_2 < 4; subY_2++)
{

70
resources/shaders/metal/d3d9/tile.fs.metal
View File

@ -6,7 +6,7 @@
using namespace metal;
constant float3 _1123 = {};
constant float3 _1121 = {};
struct main0_out
{
@ -70,23 +70,23 @@ float4 filterRadialGradient(thread const float2& colorTexCoord, thread const tex
float c = dot(dP, dP) - (radii.x * radii.x);
float discrim = (b * b) - (a * c);
float4 color = float4(0.0);
if (abs(discrim) >= 9.9999997473787516355514526367188e-06)
if (discrim != 0.0)
{
float2 ts = float2((float2(1.0, -1.0) * sqrt(discrim)) + float2(b)) / float2(a);
if (ts.x > ts.y)
{
ts = ts.yx;
}
float _583;
float _581;
if (ts.x >= 0.0)
{
_583 = ts.x;
_581 = ts.x;
}
else
{
_583 = ts.y;
_581 = ts.y;
}
float t = _583;
float t = _581;
color = colorTexture.sample(colorTextureSmplr, (uvOrigin + float2(t, 0.0)));
}
return color;
@ -100,19 +100,19 @@ float4 filterBlur(thread const float2& colorTexCoord, thread const texture2d<flo
float3 gaussCoeff = filterParams1.xyz;
float gaussSum = gaussCoeff.x;
float4 color = colorTexture.sample(colorTextureSmplr, colorTexCoord) * gaussCoeff.x;
float2 _627 = gaussCoeff.xy * gaussCoeff.yz;
gaussCoeff = float3(_627.x, _627.y, gaussCoeff.z);
float2 _625 = gaussCoeff.xy * gaussCoeff.yz;
gaussCoeff = float3(_625.x, _625.y, gaussCoeff.z);
for (int i = 1; i <= support; i += 2)
{
float gaussPartialSum = gaussCoeff.x;
float2 _647 = gaussCoeff.xy * gaussCoeff.yz;
gaussCoeff = float3(_647.x, _647.y, gaussCoeff.z);
float2 _645 = gaussCoeff.xy * gaussCoeff.yz;
gaussCoeff = float3(_645.x, _645.y, gaussCoeff.z);
gaussPartialSum += gaussCoeff.x;
float2 srcOffset = srcOffsetScale * (float(i) + (gaussCoeff.x / gaussPartialSum));
color += ((colorTexture.sample(colorTextureSmplr, (colorTexCoord - srcOffset)) + colorTexture.sample(colorTextureSmplr, (colorTexCoord + srcOffset))) * gaussPartialSum);
gaussSum += (2.0 * gaussPartialSum);
float2 _687 = gaussCoeff.xy * gaussCoeff.yz;
gaussCoeff = float3(_687.x, _687.y, gaussCoeff.z);
float2 _685 = gaussCoeff.xy * gaussCoeff.yz;
gaussCoeff = float3(_685.x, _685.y, gaussCoeff.z);
}
return color / float4(gaussSum);
}
@ -333,34 +333,34 @@ float3 compositeScreen(thread const float3& destColor, thread const float3& srcC
static inline __attribute__((always_inline))
float3 compositeSelect(thread const bool3& cond, thread const float3& ifTrue, thread const float3& ifFalse)
{
float _807;
float _805;
if (cond.x)
{
_807 = ifTrue.x;
_805 = ifTrue.x;
}
else
{
_807 = ifFalse.x;
_805 = ifFalse.x;
}
float _818;
float _816;
if (cond.y)
{
_818 = ifTrue.y;
_816 = ifTrue.y;
}
else
{
_818 = ifFalse.y;
_816 = ifFalse.y;
}
float _829;
float _827;
if (cond.z)
{
_829 = ifTrue.z;
_827 = ifTrue.z;
}
else
{
_829 = ifFalse.z;
_827 = ifFalse.z;
}
return float3(_807, _818, _829);
return float3(_805, _816, _827);
}
static inline __attribute__((always_inline))
@ -405,16 +405,16 @@ float3 compositeSoftLight(thread const float3& destColor, thread const float3& s
static inline __attribute__((always_inline))
float compositeDivide(thread const float& num, thread const float& denom)
{
float _843;
float _841;
if (denom != 0.0)
{
_843 = num / denom;
_841 = num / denom;
}
else
{
_843 = 0.0;
_841 = 0.0;
}
return _843;
return _841;
}
static inline __attribute__((always_inline))
@ -424,25 +424,25 @@ float3 compositeRGBToHSL(thread const float3& rgb)
float xMin = fast::min(fast::min(rgb.x, rgb.y), rgb.z);
float c = v - xMin;
float l = mix(xMin, v, 0.5);
float3 _949;
float3 _947;
if (rgb.x == v)
{
_949 = float3(0.0, rgb.yz);
_947 = float3(0.0, rgb.yz);
}
else
{
float3 _962;
float3 _960;
if (rgb.y == v)
{
_962 = float3(2.0, rgb.zx);
_960 = float3(2.0, rgb.zx);
}
else
{
_962 = float3(4.0, rgb.xy);
_960 = float3(4.0, rgb.xy);
}
_949 = _962;
_947 = _960;
}
float3 terms = _949;
float3 terms = _947;
float param = ((terms.x * c) + terms.y) - terms.z;
float param_1 = c;
float h = 1.0471975803375244140625 * compositeDivide(param, param_1);
@ -616,8 +616,8 @@ float4 calculateColor(thread const float2& fragCoord, thread const texture2d<flo
float2 param_19 = fragCoord;
int param_20 = compositeOp;
color = composite(param_17, destTexture, destTextureSmplr, param_18, param_19, param_20);
float3 _1411 = color.xyz * color.w;
color = float4(_1411.x, _1411.y, _1411.z, color.w);
float3 _1409 = color.xyz * color.w;
color = float4(_1409.x, _1409.y, _1409.z, color.w);
return color;
}

4
shaders/tile_fragment.inc.glsl
View File

@ -29,8 +29,6 @@
// + +
// Color UV 0 Color UV 1
#define EPSILON 0.00001
#define FRAC_6_PI 1.9098593171027443
#define FRAC_PI_3 1.0471975511965976
@ -292,7 +290,7 @@ vec4 filterRadialGradient(vec2 colorTexCoord,
float discrim = b * b - a * c;
vec4 color = vec4(0.0);
if (abs(discrim) >= EPSILON) {
if (discrim != 0.0) {
vec2 ts = vec2(sqrt(discrim) * vec2(1.0, -1.0) + vec2(b)) / vec2(a);
if (ts.x > ts.y)
ts = ts.yx;