[gtk+/wip/baedert/gl] merge into border hidpi commit

[Timm Bäder <baedert src gnome org>]

commit f250677e8f328b806790e0a4da2057b0b25cd141
Author: Timm Bäder <mail baedert org>
Date:   Sat Dec 9 09:25:39 2017 +0100

    merge into border hidpi commit

 gsk/gl/gskglrenderer.c |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/gsk/gl/gskglrenderer.c b/gsk/gl/gskglrenderer.c
index 311cfa0..651b1d5 100644
--- a/gsk/gl/gskglrenderer.c
+++ b/gsk/gl/gskglrenderer.c
@@ -423,14 +423,14 @@ render_border_node (GskGLRenderer   *self,
   const gboolean needs_clip = TRUE;/*!gsk_rounded_rect_is_rectilinear (rounded_outline);*/
   int i;
   GskRoundedRect prev_clip;
-  GskRoundedRect child_clip;
   struct {
     float w;
     float h;
   } sizes[4];
 
+
   for (i = 0; i < 4; i ++)
-    widths[i] = og_widths[i] * self->scale_factor;
+    widths[i] = og_widths[i];
 
   /* Top left */
   if (widths[3] > 0)
@@ -478,13 +478,12 @@ render_border_node (GskGLRenderer   *self,
     sizes[3].h = 0;
 
   for (i = 0; i < 4; i ++)
-    {
-      sizes[i].w *= self->scale_factor;
-      sizes[i].h *= self->scale_factor;
-    }
+    widths[i] *= self->scale_factor;
 
   if (needs_clip)
     {
+      GskRoundedRect child_clip;
+
       ops_set_program (builder, &self->border_program);
 
       rounded_rect_intersect (self, builder, rounded_outline, &child_clip);