vulkan: Simplify
authorBenjamin Otte <otte@redhat.com>
Thu, 13 Jul 2023 09:23:02 +0000 (11:23 +0200)
committerBenjamin Otte <otte@redhat.com>
Sun, 16 Jul 2023 11:16:43 +0000 (13:16 +0200)
The renderpassop always has a matching end op, so there is no need to
check for the end of operations and emit one manually.

gsk/vulkan/gskvulkanrenderpassop.c

index 400f68cb05e16b06f38d15a2361b499a888a8f75..5614f0eee390393abd307062b8670d7d2f5ce11f 100644 (file)
@@ -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;
 }