diff --git a/gsk/vulkan/gskvulkanrender.c b/gsk/vulkan/gskvulkanrender.c
index 3264daa2b8..b0d4f1f10a 100644
--- a/gsk/vulkan/gskvulkanrender.c
+++ b/gsk/vulkan/gskvulkanrender.c
@@ -68,7 +68,7 @@ gsk_vulkan_render_setup (GskVulkanRender       *self,
                          const graphene_rect_t *rect,
                          const cairo_region_t  *clip)
 {
-  GdkSurface *window = gsk_renderer_get_surface (self->renderer);
+  GdkSurface *surface = gsk_renderer_get_surface (self->renderer);
 
   self->target = g_object_ref (target);
 
@@ -79,10 +79,10 @@ gsk_vulkan_render_setup (GskVulkanRender       *self,
     }
   else
     {
-      self->scale_factor = gdk_surface_get_scale_factor (gsk_renderer_get_surface (self->renderer));
+      self->scale_factor = gdk_surface_get_scale_factor (surface);
       self->viewport = GRAPHENE_RECT_INIT (0, 0,
-                                           gdk_surface_get_width (window) * self->scale_factor,
-                                           gdk_surface_get_height (window) * self->scale_factor);
+                                           gdk_surface_get_width (surface) * self->scale_factor,
+                                           gdk_surface_get_height (surface) * self->scale_factor);
     }
   if (clip)
     {
diff --git a/gsk/vulkan/gskvulkanrenderer.c b/gsk/vulkan/gskvulkanrenderer.c
index b634a2b761..217cdab717 100644
--- a/gsk/vulkan/gskvulkanrenderer.c
+++ b/gsk/vulkan/gskvulkanrenderer.c
@@ -249,11 +249,8 @@ gsk_vulkan_renderer_render_texture (GskRenderer           *renderer,
                                                 ceil (viewport->size.height));
 
   gsk_vulkan_render_reset (render, image, viewport, NULL);
-
   gsk_vulkan_render_add_node (render, root);
-
   gsk_vulkan_render_upload (render);
-
   gsk_vulkan_render_draw (render);
 
   texture = gsk_vulkan_render_download_target (render);
@@ -308,12 +305,10 @@ gsk_vulkan_renderer_render (GskRenderer          *renderer,
 
   render_region = get_render_region (self);
   draw_index = gdk_vulkan_context_get_draw_index (self->vulkan);
+
   gsk_vulkan_render_reset (render, self->targets[draw_index], NULL, render_region);
-
   gsk_vulkan_render_add_node (render, root);
-
   gsk_vulkan_render_upload (render);
-
   gsk_vulkan_render_draw (render);
 
 #ifdef G_ENABLE_DEBUG