From: Benjamin Otte Date: Sun, 25 Jun 2023 20:16:37 +0000 (+0200) Subject: vulkan: Add an argument to vfunc X-Git-Tag: archive/raspbian/4.12.3+ds-1+rpi1~1^2^2^2~22^2~1^2~60^2~80 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f53da409e5c6b9cb934d4fde91331dd36149cc9e;p=gtk4.git vulkan: Add an argument to vfunc We need this in the future. --- diff --git a/gsk/vulkan/gskvulkanop.c b/gsk/vulkan/gskvulkanop.c index 20f7f22b5e..e4fc3018bb 100644 --- a/gsk/vulkan/gskvulkanop.c +++ b/gsk/vulkan/gskvulkanop.c @@ -57,9 +57,10 @@ gsk_vulkan_op_get_pipeline (GskVulkanOp *op) void gsk_vulkan_op_command (GskVulkanOp *op, + GskVulkanRender *render, VkPipelineLayout pipeline_layout, VkCommandBuffer command_buffer) { - op->op_class->command (op, pipeline_layout, command_buffer); + op->op_class->command (op, render, pipeline_layout, command_buffer); } diff --git a/gsk/vulkan/gskvulkanopprivate.h b/gsk/vulkan/gskvulkanopprivate.h index 92c380e75f..43437cb9bc 100644 --- a/gsk/vulkan/gskvulkanopprivate.h +++ b/gsk/vulkan/gskvulkanopprivate.h @@ -36,6 +36,7 @@ struct _GskVulkanOpClass GskVulkanRender *render); GskVulkanPipeline * (* get_pipeline) (GskVulkanOp *op); void (* command) (GskVulkanOp *op, + GskVulkanRender *render, VkPipelineLayout pipeline_layout, VkCommandBuffer command_buffer); }; @@ -63,6 +64,7 @@ void gsk_vulkan_op_reserve_descriptor_sets (GskVulk GskVulkanRender *render); GskVulkanPipeline * gsk_vulkan_op_get_pipeline (GskVulkanOp *op); void gsk_vulkan_op_command (GskVulkanOp *op, + GskVulkanRender *render, VkPipelineLayout pipeline_layout, VkCommandBuffer command_buffer); diff --git a/gsk/vulkan/gskvulkanrenderpass.c b/gsk/vulkan/gskvulkanrenderpass.c index f3c09e1a4a..0b3e553487 100644 --- a/gsk/vulkan/gskvulkanrenderpass.c +++ b/gsk/vulkan/gskvulkanrenderpass.c @@ -2304,7 +2304,7 @@ gsk_vulkan_render_pass_draw_rect (GskVulkanRenderPass *self, gsk_vulkan_pipeline_get_pipeline (current_pipeline)); } - gsk_vulkan_op_command (op, pipeline_layout, command_buffer); + gsk_vulkan_op_command (op, render, pipeline_layout, command_buffer); } } @@ -2346,6 +2346,7 @@ gsk_vulkan_render_op_get_pipeline (GskVulkanOp *op_) static void gsk_vulkan_render_op_command (GskVulkanOp *op_, + GskVulkanRender *render, VkPipelineLayout pipeline_layout, VkCommandBuffer command_buffer) { diff --git a/gsk/vulkan/gskvulkanscissorop.c b/gsk/vulkan/gskvulkanscissorop.c index e763306486..bd9a3c5a69 100644 --- a/gsk/vulkan/gskvulkanscissorop.c +++ b/gsk/vulkan/gskvulkanscissorop.c @@ -55,6 +55,7 @@ gsk_vulkan_scissor_op_get_pipeline (GskVulkanOp *op) static void gsk_vulkan_scissor_op_command (GskVulkanOp *op, + GskVulkanRender *render, VkPipelineLayout pipeline_layout, VkCommandBuffer command_buffer) { diff --git a/gsk/vulkan/gskvulkantextureop.c b/gsk/vulkan/gskvulkantextureop.c index 3dee37cf39..0628f15898 100644 --- a/gsk/vulkan/gskvulkantextureop.c +++ b/gsk/vulkan/gskvulkantextureop.c @@ -98,6 +98,7 @@ gsk_vulkan_texture_op_get_pipeline (GskVulkanOp *op) static void gsk_vulkan_texture_op_command (GskVulkanOp *op, + GskVulkanRender *render, VkPipelineLayout pipeline_layout, VkCommandBuffer command_buffer) { diff --git a/gsk/vulkan/gskvulkanuploadop.c b/gsk/vulkan/gskvulkanuploadop.c index ae912c8d38..81e61e347d 100644 --- a/gsk/vulkan/gskvulkanuploadop.c +++ b/gsk/vulkan/gskvulkanuploadop.c @@ -70,6 +70,7 @@ gsk_vulkan_upload_op_get_pipeline (GskVulkanOp *op) static void gsk_vulkan_upload_op_command (GskVulkanOp *op, + GskVulkanRender *render, VkPipelineLayout pipeline_layout, VkCommandBuffer command_buffer) {