From: Timm Bäder Date: Sun, 22 Dec 2019 14:53:46 +0000 (+0100) Subject: gl renderer: Avoid another manual rounded rect transform X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~20^2~390 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=8b1af398a052786202032772458ef25d536ee67d;p=gtk4.git gl renderer: Avoid another manual rounded rect transform We have transform_rect() for this now. --- diff --git a/gsk/gl/gskglrenderer.c b/gsk/gl/gskglrenderer.c index 628f1aa575..d9fa0e9a98 100644 --- a/gsk/gl/gskglrenderer.c +++ b/gsk/gl/gskglrenderer.c @@ -1637,24 +1637,17 @@ render_inset_shadow_node (GskGLRenderer *self, const float min_y = builder->dy + node->bounds.origin.y; const float max_x = min_x + node->bounds.size.width; const float max_y = min_y + node->bounds.size.height; - float tx1 = blur_extra / 2.0 * scale / texture_width; - float tx2 = 1.0 - tx1; - float ty1 = blur_extra / 2.0 * scale / texture_height; - float ty2 = 1.0 - ty1; - GskRoundedRect node_clip; - int i; + const float tx1 = blur_extra / 2.0 * scale / texture_width; + const float tx2 = 1.0 - tx1; + const float ty1 = blur_extra / 2.0 * scale / texture_height; + const float ty2 = 1.0 - ty1; gsk_gl_driver_set_texture_for_pointer (self->gl_driver, node, blurred_texture_id); if (needs_clip) { - ops_transform_bounds_modelview (builder, &node_outline->bounds, &node_clip.bounds); + const GskRoundedRect node_clip = transform_rect (self, builder, node_outline); - for (i = 0; i < 4; i ++) - { - node_clip.corner[i].width = node_outline->corner[i].width * scale; - node_clip.corner[i].height = node_outline->corner[i].height * scale; - } ops_push_clip (builder, &node_clip); }