From: Benjamin Otte <otte@redhat.com>
Date: Thu, 13 Jul 2023 09:23:02 +0000 (+0200)
Subject: vulkan: Simplify
X-Git-Tag: archive/raspbian/4.12.3+ds-1+rpi1~1^2^2^2~22^2~1^2~60^2~19
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=372dcba9c9301863ff08cf7193cecdb79630940b;p=gtk4.git

vulkan: Simplify

The renderpassop always has a matching end op, so there is no need to
check for the end of operations and emit one manually.
---

diff --git a/gsk/vulkan/gskvulkanrenderpassop.c b/gsk/vulkan/gskvulkanrenderpassop.c
index 400f68cb05..5614f0eee3 100644
--- a/gsk/vulkan/gskvulkanrenderpassop.c
+++ b/gsk/vulkan/gskvulkanrenderpassop.c
@@ -80,7 +80,7 @@ gsk_vulkan_render_pass_op_command (GskVulkanOp      *op,
   vk_render_pass = gsk_vulkan_render_pass_begin_draw (self->render_pass, render, pipeline_layout, command_buffer);
 
   op = op->next;
-  while (op && op->op_class->stage != GSK_VULKAN_STAGE_END_PASS)
+  while (op->op_class->stage != GSK_VULKAN_STAGE_END_PASS)
     {
       if (op->op_class->shader_name &&
           (op->op_class != current_pipeline_class ||
@@ -101,10 +101,7 @@ gsk_vulkan_render_pass_op_command (GskVulkanOp      *op,
       op = gsk_vulkan_op_command (op, render, pipeline_layout, command_buffer);
     }
 
-  if (op && op->op_class->stage == GSK_VULKAN_STAGE_END_PASS)
-    op = gsk_vulkan_op_command (op, render, pipeline_layout, command_buffer);
-  else
-    gsk_vulkan_render_pass_end_draw (self->render_pass, render, pipeline_layout, command_buffer);
+  op = gsk_vulkan_op_command (op, render, pipeline_layout, command_buffer);
 
   return op;
 }