gl: short-circuit on NULL program
authorChristian Hergert <chergert@redhat.com>
Wed, 9 Oct 2019 18:51:32 +0000 (11:51 -0700)
committerChristian Hergert <chergert@redhat.com>
Wed, 9 Oct 2019 18:51:32 +0000 (11:51 -0700)
The NULL check is a more inclusive check than each of the individual
op->op checks.

gsk/gl/gskglrenderer.c

index a3888179731a4c9599c7ade53c0cc6894848c4f4..25b4c9b4208f4f872c3d45e658c9e8f4f05e636d 100644 (file)
@@ -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);