[gtk/wip/chergert/glproto: 127/526] DRY viewport change

[Christian Hergert <chergert src gnome org>]

commit 6f65eead46885b555b092defb2ed226089e2898c
Author: Christian Hergert <chergert redhat com>
Date:   Mon Dec 28 09:10:35 2020 -0800

    DRY viewport change

 gsk/next/gskglcommandqueue.c | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)
---
diff --git a/gsk/next/gskglcommandqueue.c b/gsk/next/gskglcommandqueue.c
index b4922f2fd0..ce26d409a2 100644
--- a/gsk/next/gskglcommandqueue.c
+++ b/gsk/next/gskglcommandqueue.c
@@ -878,6 +878,20 @@ apply_uniform (GskGLUniformState      *state,
     }
 }
 
+static inline void
+apply_viewport (guint16 *current_width,
+                guint16 *current_height,
+                guint16 width,
+                guint16 height)
+{
+  if (*current_width != width || *current_height != height)
+    {
+      *current_width = width;
+      *current_height = height;
+      glViewport (0, 0, width, height);
+    }
+}
+
 /**
  * gsk_gl_command_queue_execute:
  * @self: a #GskGLCommandQueue
@@ -946,12 +960,7 @@ gsk_gl_command_queue_execute (GskGLCommandQueue *self)
               glBindFramebuffer (GL_FRAMEBUFFER, framebuffer);
             }
 
-          if (width != batch->any.viewport.width || height != batch->any.viewport.height)
-            {
-              width = batch->any.viewport.width;
-              height = batch->any.viewport.height;
-              glViewport (0, 0, width, height);
-            }
+          apply_viewport (&width, &height, batch->any.viewport.width, batch->any.viewport.width);
 
           glClear (batch->clear.bits);
         break;
@@ -971,12 +980,7 @@ gsk_gl_command_queue_execute (GskGLCommandQueue *self)
               glBindFramebuffer (GL_FRAMEBUFFER, framebuffer);
             }
 
-          if (width != batch->any.viewport.width || height != batch->any.viewport.height)
-            {
-              width = batch->any.viewport.width;
-              height = batch->any.viewport.height;
-              glViewport (0, 0, width, height);
-            }
+          apply_viewport (&width, &height, batch->any.viewport.width, batch->any.viewport.width);
 
           if (batch->draw.bind_count > 0)
             {