mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2024-12-27 06:00:22 +00:00
e9089f65e3
The code now follows gsk_rounded_rect_shrink() and with it the behavior of the Cairo renderer and Webkit. The old code did what the GL renderer and Cairo do, but I consider that wrong. I did not test Chrome. Test attached
76 lines
2.3 KiB
GLSL
76 lines
2.3 KiB
GLSL
uniform mat4 u_projection;
|
|
uniform mat4 u_modelview;
|
|
uniform float u_alpha;
|
|
|
|
#if defined(GSK_GLES) || defined(GSK_LEGACY)
|
|
attribute vec2 aPosition;
|
|
attribute vec2 aUv;
|
|
attribute vec4 aColor;
|
|
attribute vec4 aColor2;
|
|
_OUT_ vec2 vUv;
|
|
#else
|
|
_IN_ vec2 aPosition;
|
|
_IN_ vec2 aUv;
|
|
_IN_ vec4 aColor;
|
|
_IN_ vec4 aColor2;
|
|
_OUT_ vec2 vUv;
|
|
#endif
|
|
|
|
// amount is: top, right, bottom, left
|
|
GskRoundedRect
|
|
gsk_rounded_rect_shrink (GskRoundedRect r, vec4 amount)
|
|
{
|
|
vec4 new_bounds = r.bounds + vec4(1.0,1.0,-1.0,-1.0) * amount.wxyz;
|
|
vec4 new_corner_points1 = r.corner_points1;
|
|
vec4 new_corner_points2 = r.corner_points2;
|
|
|
|
if (r.corner_points1.xy == r.bounds.xy) new_corner_points1.xy = new_bounds.xy;
|
|
if (r.corner_points1.zw == r.bounds.zy) new_corner_points1.zw = new_bounds.zy;
|
|
if (r.corner_points2.xy == r.bounds.zw) new_corner_points2.xy = new_bounds.zw;
|
|
if (r.corner_points2.zw == r.bounds.xw) new_corner_points2.zw = new_bounds.xw;
|
|
new_corner_points1 = clamp (new_corner_points1, new_bounds.xyxy, new_bounds.zwzw);
|
|
new_corner_points2 = clamp (new_corner_points2, new_bounds.xyxy, new_bounds.zwzw);
|
|
|
|
return GskRoundedRect (new_bounds, new_corner_points1, new_corner_points2);
|
|
}
|
|
|
|
void
|
|
gsk_rounded_rect_offset(inout GskRoundedRect r, vec2 offset)
|
|
{
|
|
r.bounds.xy += offset;
|
|
r.bounds.zw += offset;
|
|
r.corner_points1.xy += offset;
|
|
r.corner_points1.zw += offset;
|
|
r.corner_points2.xy += offset;
|
|
r.corner_points2.zw += offset;
|
|
}
|
|
|
|
void gsk_rounded_rect_transform(inout GskRoundedRect r, mat4 mat)
|
|
{
|
|
r.bounds.xy = (mat * vec4(r.bounds.xy, 0.0, 1.0)).xy;
|
|
r.bounds.zw = (mat * vec4(r.bounds.zw, 0.0, 1.0)).xy;
|
|
|
|
r.corner_points1.xy = (mat * vec4(r.corner_points1.xy, 0.0, 1.0)).xy;
|
|
r.corner_points1.zw = (mat * vec4(r.corner_points1.zw, 0.0, 1.0)).xy;
|
|
|
|
r.corner_points2.xy = (mat * vec4(r.corner_points2.xy, 0.0, 1.0)).xy;
|
|
r.corner_points2.zw = (mat * vec4(r.corner_points2.zw, 0.0, 1.0)).xy;
|
|
}
|
|
|
|
#if defined(GSK_LEGACY)
|
|
// Can't have out or inout array parameters...
|
|
#define gsk_rounded_rect_encode(r, uni) uni[0] = r.bounds; uni[1] = r.corner_points1; uni[2] = r.corner_points2;
|
|
#else
|
|
void gsk_rounded_rect_encode(GskRoundedRect r, out _GSK_ROUNDED_RECT_UNIFORM_ out_r)
|
|
{
|
|
#if defined(GSK_GLES)
|
|
out_r[0] = r.bounds;
|
|
out_r[1] = r.corner_points1;
|
|
out_r[2] = r.corner_points2;
|
|
#else
|
|
out_r = r;
|
|
#endif
|
|
}
|
|
|
|
#endif
|