summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2021-04-11 22:26:36 -0400
committerMatthias Clasen <mclasen@redhat.com>2021-04-11 22:35:02 -0400
commit849692b24ba2073f9ef1edfe5de9ec6a6b169bd8 (patch)
tree61f5e371d67efde3644d2a3b7f78f88db52883cf
parentf3bf4e487690443ba6f3acc341ad7f7293b0aae4 (diff)
downloadgtk+-ngl-shadow-fixes.tar.gz
ngl: Fix unevenly scaled shadowsngl-shadow-fixes
Ensure that we don't cut them off at the edges.
-rw-r--r--gsk/ngl/gsknglrenderjob.c16
-rw-r--r--gsk/ngl/gskngltexturepool.c5
-rw-r--r--gsk/ngl/gskngltexturepoolprivate.h3
-rw-r--r--gsk/ngl/ninesliceprivate.h101
4 files changed, 65 insertions, 60 deletions
diff --git a/gsk/ngl/gsknglrenderjob.c b/gsk/ngl/gsknglrenderjob.c
index 5c34d1273b..e23d4741c6 100644
--- a/gsk/ngl/gsknglrenderjob.c
+++ b/gsk/ngl/gsknglrenderjob.c
@@ -2299,7 +2299,8 @@ gsk_ngl_render_job_visit_blurred_outset_shadow_node (GskNglRenderJob *job,
float blur_radius = gsk_outset_shadow_node_get_blur_radius (node);
float blur_extra = blur_radius * 2.0f; /* 2.0 = shader radius_multiplier */
float half_blur_extra = blur_extra / 2.0f;
- int extra_blur_pixels = ceilf (half_blur_extra * scale_x);
+ int extra_blur_pixels_x = ceilf (half_blur_extra * scale_x);
+ int extra_blur_pixels_y = ceilf (half_blur_extra * scale_y);
float spread = gsk_outset_shadow_node_get_spread (node);
float dx = gsk_outset_shadow_node_get_dx (node);
float dy = gsk_outset_shadow_node_get_dy (node);
@@ -2352,10 +2353,10 @@ gsk_ngl_render_job_visit_blurred_outset_shadow_node (GskNglRenderJob *job,
texture_width = (int)ceil ((scaled_outline.bounds.size.width + blur_extra) * scale_x);
texture_height = (int)ceil ((scaled_outline.bounds.size.height + blur_extra) * scale_y);
- scaled_outline.bounds.origin.x = extra_blur_pixels;
- scaled_outline.bounds.origin.y = extra_blur_pixels;
- scaled_outline.bounds.size.width = texture_width - (extra_blur_pixels * 2);
- scaled_outline.bounds.size.height = texture_height - (extra_blur_pixels * 2);
+ scaled_outline.bounds.origin.x = extra_blur_pixels_x;
+ scaled_outline.bounds.origin.y = extra_blur_pixels_y;
+ scaled_outline.bounds.size.width = texture_width - (extra_blur_pixels_x * 2);
+ scaled_outline.bounds.size.height = texture_height - (extra_blur_pixels_y * 2);
for (guint i = 0; i < G_N_ELEMENTS (scaled_outline.corner); i++)
{
@@ -2493,12 +2494,13 @@ gsk_ngl_render_job_visit_blurred_outset_shadow_node (GskNglRenderJob *job,
GskNglTexture *texture;
texture = gsk_ngl_driver_get_texture_by_id (job->driver, blurred_texture_id);
- slices = gsk_ngl_texture_get_nine_slice (texture, &scaled_outline, extra_blur_pixels);
+ slices = gsk_ngl_texture_get_nine_slice (texture, &scaled_outline, extra_blur_pixels_x, extra_blur_pixels_y);
offscreen.was_offscreen = TRUE;
/* Our texture coordinates MUST be scaled, while the actual vertex coords
- * MUST NOT be scaled. */
+ * MUST NOT be scaled.
+ */
left_width = slices[NINE_SLICE_TOP_LEFT].rect.width / scale_x;
right_width = slices[NINE_SLICE_TOP_RIGHT].rect.width / scale_x;
diff --git a/gsk/ngl/gskngltexturepool.c b/gsk/ngl/gskngltexturepool.c
index 707ae37455..c5a1d04c4e 100644
--- a/gsk/ngl/gskngltexturepool.c
+++ b/gsk/ngl/gskngltexturepool.c
@@ -170,7 +170,8 @@ gsk_ngl_texture_new (guint texture_id,
const GskNglTextureNineSlice *
gsk_ngl_texture_get_nine_slice (GskNglTexture *texture,
const GskRoundedRect *outline,
- float extra_pixels)
+ float extra_pixels_x,
+ float extra_pixels_y)
{
g_assert (texture != NULL);
g_assert (outline != NULL);
@@ -180,7 +181,7 @@ gsk_ngl_texture_get_nine_slice (GskNglTexture *texture,
texture->nine_slice = g_new0 (GskNglTextureNineSlice, 9);
nine_slice_rounded_rect (texture->nine_slice, outline);
- nine_slice_grow (texture->nine_slice, extra_pixels);
+ nine_slice_grow (texture->nine_slice, extra_pixels_x, extra_pixels_y);
nine_slice_to_texture_coords (texture->nine_slice, texture->width, texture->height);
}
diff --git a/gsk/ngl/gskngltexturepoolprivate.h b/gsk/ngl/gskngltexturepoolprivate.h
index ac8e326eb5..548fe83f4f 100644
--- a/gsk/ngl/gskngltexturepoolprivate.h
+++ b/gsk/ngl/gskngltexturepoolprivate.h
@@ -94,7 +94,8 @@ GskNglTexture *gsk_ngl_texture_new (guint
gint64 frame_id);
const GskNglTextureNineSlice *gsk_ngl_texture_get_nine_slice (GskNglTexture *texture,
const GskRoundedRect *outline,
- float extra_pixels);
+ float extra_pixels_x,
+ float extra_pixels_y);
void gsk_ngl_texture_free (GskNglTexture *texture);
G_END_DECLS
diff --git a/gsk/ngl/ninesliceprivate.h b/gsk/ngl/ninesliceprivate.h
index fe787acc1d..5fa191db39 100644
--- a/gsk/ngl/ninesliceprivate.h
+++ b/gsk/ngl/ninesliceprivate.h
@@ -159,121 +159,122 @@ nine_slice_to_texture_coords (GskNglTextureNineSlice *slices,
static inline void
nine_slice_grow (GskNglTextureNineSlice *slices,
- int amount)
+ int amount_x,
+ int amount_y)
{
- if (amount == 0)
+ if (amount_x == 0 && amount_y == 0)
return;
/* top left */
- slices[0].rect.x -= amount;
- slices[0].rect.y -= amount;
- if (amount > slices[0].rect.width)
- slices[0].rect.width += amount * 2;
+ slices[0].rect.x -= amount_x;
+ slices[0].rect.y -= amount_y;
+ if (amount_x > slices[0].rect.width)
+ slices[0].rect.width += amount_x * 2;
else
- slices[0].rect.width += amount;
+ slices[0].rect.width += amount_x;
- if (amount > slices[0].rect.height)
- slices[0].rect.height += amount * 2;
+ if (amount_y > slices[0].rect.height)
+ slices[0].rect.height += amount_y * 2;
else
- slices[0].rect.height += amount;
+ slices[0].rect.height += amount_y;
/* Top center */
- slices[1].rect.y -= amount;
- if (amount > slices[1].rect.height)
- slices[1].rect.height += amount * 2;
+ slices[1].rect.y -= amount_y;
+ if (amount_y > slices[1].rect.height)
+ slices[1].rect.height += amount_y * 2;
else
- slices[1].rect.height += amount;
+ slices[1].rect.height += amount_y;
/* top right */
- slices[2].rect.y -= amount;
- if (amount > slices[2].rect.width)
+ slices[2].rect.y -= amount_y;
+ if (amount_x > slices[2].rect.width)
{
- slices[2].rect.x -= amount;
- slices[2].rect.width += amount * 2;
+ slices[2].rect.x -= amount_x;
+ slices[2].rect.width += amount_x * 2;
}
else
{
- slices[2].rect.width += amount;
+ slices[2].rect.width += amount_x;
}
- if (amount > slices[2].rect.height)
- slices[2].rect.height += amount * 2;
+ if (amount_y > slices[2].rect.height)
+ slices[2].rect.height += amount_y * 2;
else
- slices[2].rect.height += amount;
+ slices[2].rect.height += amount_y;
- slices[3].rect.x -= amount;
- if (amount > slices[3].rect.width)
- slices[3].rect.width += amount * 2;
+ slices[3].rect.x -= amount_x;
+ if (amount_x > slices[3].rect.width)
+ slices[3].rect.width += amount_x * 2;
else
- slices[3].rect.width += amount;
+ slices[3].rect.width += amount_x;
/* Leave center alone */
- if (amount > slices[5].rect.width)
+ if (amount_x > slices[5].rect.width)
{
- slices[5].rect.x -= amount;
- slices[5].rect.width += amount * 2;
+ slices[5].rect.x -= amount_x;
+ slices[5].rect.width += amount_x * 2;
}
else
{
- slices[5].rect.width += amount;
+ slices[5].rect.width += amount_x;
}
/* Bottom left */
- slices[6].rect.x -= amount;
- if (amount > slices[6].rect.width)
+ slices[6].rect.x -= amount_x;
+ if (amount_x > slices[6].rect.width)
{
- slices[6].rect.width += amount * 2;
+ slices[6].rect.width += amount_x * 2;
}
else
{
- slices[6].rect.width += amount;
+ slices[6].rect.width += amount_x;
}
- if (amount > slices[6].rect.height)
+ if (amount_y > slices[6].rect.height)
{
- slices[6].rect.y -= amount;
- slices[6].rect.height += amount * 2;
+ slices[6].rect.y -= amount_y;
+ slices[6].rect.height += amount_y * 2;
}
else
{
- slices[6].rect.height += amount;
+ slices[6].rect.height += amount_y;
}
/* Bottom center */
- if (amount > slices[7].rect.height)
+ if (amount_y > slices[7].rect.height)
{
- slices[7].rect.y -= amount;
- slices[7].rect.height += amount * 2;
+ slices[7].rect.y -= amount_y;
+ slices[7].rect.height += amount_y * 2;
}
else
{
- slices[7].rect.height += amount;
+ slices[7].rect.height += amount_y;
}
- if (amount > slices[8].rect.width)
+ if (amount_x > slices[8].rect.width)
{
- slices[8].rect.x -= amount;
- slices[8].rect.width += amount * 2;
+ slices[8].rect.x -= amount_x;
+ slices[8].rect.width += amount_x * 2;
}
else
{
- slices[8].rect.width += amount;
+ slices[8].rect.width += amount_x;
}
- if (amount > slices[8].rect.height)
+ if (amount_y > slices[8].rect.height)
{
- slices[8].rect.y -= amount;
- slices[8].rect.height += amount * 2;
+ slices[8].rect.y -= amount_y;
+ slices[8].rect.height += amount_y * 2;
}
else
{
- slices[8].rect.height += amount;
+ slices[8].rect.height += amount_y;
}
#ifdef DEBUG_NINE_SLICE