From ddcff9eb0f309e08d1e806dcf79f3a81d512f268 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timm=20B=C3=A4der?= Date: Thu, 1 Oct 2020 09:38:39 +0200 Subject: [PATCH] gl renderer: simplify ->render() implementation a bit We already use self->scale_factor when initialized whole_surface, so set self->scale_factor first. --- gsk/gl/gskglrenderer.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gsk/gl/gskglrenderer.c b/gsk/gl/gskglrenderer.c index 55f3001bb0..8fc0783034 100644 --- a/gsk/gl/gskglrenderer.c +++ b/gsk/gl/gskglrenderer.c @@ -4369,11 +4369,13 @@ gsk_gl_renderer_render (GskRenderer *renderer, if (self->gl_context == NULL) return; + surface = gsk_renderer_get_surface (renderer); + self->scale_factor = gdk_surface_get_scale_factor (surface); + gdk_gl_context_make_current (self->gl_context); gdk_gl_context_push_debug_group_printf (self->gl_context, "Render root node %p", root); - surface = gsk_renderer_get_surface (renderer); whole_surface = (GdkRectangle) { 0, 0, gdk_surface_get_width (surface) * self->scale_factor, @@ -4401,13 +4403,12 @@ gsk_gl_renderer_render (GskRenderer *renderer, self->render_region = cairo_region_create_rectangle (&extents); } - self->scale_factor = gdk_surface_get_scale_factor (surface); gdk_gl_context_make_current (self->gl_context); viewport.origin.x = 0; viewport.origin.y = 0; - viewport.size.width = gdk_surface_get_width (surface) * self->scale_factor; - viewport.size.height = gdk_surface_get_height (surface) * self->scale_factor; + viewport.size.width = whole_surface.width; + viewport.size.height = whole_surface.height; gsk_gl_driver_begin_frame (self->gl_driver); gsk_gl_renderer_do_render (renderer, root, &viewport, 0, self->scale_factor);