From: Christian Hergert <chergert@redhat.com>
Date: Wed, 9 Oct 2019 18:51:32 +0000 (-0700)
Subject: gl: short-circuit on NULL program
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~20^2~756
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c9ca60c201216e0a7bf933a0cbb5225cab38fa87;p=gtk4.git

gl: short-circuit on NULL program

The NULL check is a more inclusive check than each of the individual
op->op checks.
---

diff --git a/gsk/gl/gskglrenderer.c b/gsk/gl/gskglrenderer.c
index a388817973..25b4c9b420 100644
--- a/gsk/gl/gskglrenderer.c
+++ b/gsk/gl/gskglrenderer.c
@@ -3045,12 +3045,12 @@ gsk_gl_renderer_render_ops (GskGLRenderer *self,
           op->op == OP_CHANGE_VAO)
         continue;
 
-      if (op->op != OP_PUSH_DEBUG_GROUP &&
+      if (program == NULL &&
+          op->op != OP_PUSH_DEBUG_GROUP &&
           op->op != OP_POP_DEBUG_GROUP &&
           op->op != OP_CHANGE_PROGRAM &&
           op->op != OP_CHANGE_RENDER_TARGET &&
-          op->op != OP_CLEAR &&
-          program == NULL)
+          op->op != OP_CLEAR)
         continue;
 
       OP_PRINT ("Op %u: %u", i, op->op);