AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-13 05:50:10 +00:00
Code Issues Projects Releases Wiki Activity

vulkan: Merge function into only caller

Browse Source 
The renderpass reshuffling means we can move a bunch of functions now.

This is one of them.
This commit is contained in:
Benjamin Otte 2023-07-13 11:17:04 +02:00
parent 0edd7547c1
commit af817a3362
3 changed files with 34 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
gsk/vulkan/gskvulkanrender.c
View File

@ -892,48 +892,6 @@ gsk_vulkan_render_collect_vertex_buffer (GskVulkanRender *self)
gsk_vulkan_buffer_unmap (self->vertex_buffer);
}
GskVulkanOp *
gsk_vulkan_render_draw_pass (GskVulkanRender *self,
GskVulkanRenderPass *render_pass,
GskVulkanOp *op,
VkCommandBuffer command_buffer)
{
VkPipeline current_pipeline = VK_NULL_HANDLE;
const GskVulkanOpClass *current_pipeline_class = NULL;
const char *current_pipeline_clip_type = NULL;
VkRenderPass vk_render_pass;
vk_render_pass = gsk_vulkan_render_pass_begin_draw (render_pass, self, self->pipeline_layout, command_buffer);
while (op && op->op_class->stage != GSK_VULKAN_STAGE_END_PASS)
{
if (op->op_class->shader_name &&
(op->op_class != current_pipeline_class ||
current_pipeline_clip_type != op->clip_type))
{
current_pipeline = gsk_vulkan_render_get_pipeline (self,
op->op_class,
op->clip_type,
gsk_vulkan_image_get_vk_format (self->target),
vk_render_pass);
vkCmdBindPipeline (command_buffer,
VK_PIPELINE_BIND_POINT_GRAPHICS,
current_pipeline);
current_pipeline_class = op->op_class;
current_pipeline_clip_type = op->clip_type;
}
op = gsk_vulkan_op_command (op, self, self->pipeline_layout, command_buffer);
}
if (op && op->op_class->stage == GSK_VULKAN_STAGE_END_PASS)
op = gsk_vulkan_op_command (op, self, self->pipeline_layout, command_buffer);
else
gsk_vulkan_render_pass_end_draw (render_pass, self, self->pipeline_layout, command_buffer);
return op;
}
void
gsk_vulkan_render_draw (GskVulkanRender *self)
{

35
gsk/vulkan/gskvulkanrenderpassop.c
View File

@ -72,8 +72,41 @@ gsk_vulkan_render_pass_op_command (GskVulkanOp *op,
VkCommandBuffer command_buffer)
{
GskVulkanRenderPassOp *self = (GskVulkanRenderPassOp *) op;
VkPipeline current_pipeline = VK_NULL_HANDLE;
const GskVulkanOpClass *current_pipeline_class = NULL;
const char *current_pipeline_clip_type = NULL;
VkRenderPass vk_render_pass;
return gsk_vulkan_render_draw_pass (render, self->render_pass, op->next, command_buffer);
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)
{
if (op->op_class->shader_name &&
(op->op_class != current_pipeline_class ||
current_pipeline_clip_type != op->clip_type))
{
current_pipeline = gsk_vulkan_render_get_pipeline (render,
op->op_class,
op->clip_type,
gsk_vulkan_image_get_vk_format (self->image),
vk_render_pass);
vkCmdBindPipeline (command_buffer,
VK_PIPELINE_BIND_POINT_GRAPHICS,
current_pipeline);
current_pipeline_class = op->op_class;
current_pipeline_clip_type = op->clip_type;
}
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);
return op;
}
static const GskVulkanOpClass GSK_VULKAN_RENDER_PASS_OP_CLASS = {

4
gsk/vulkan/gskvulkanrenderprivate.h
View File

@ -54,10 +54,6 @@ guchar * gsk_vulkan_render_get_buffer_memory (GskVulk
gsize *out_offset);
void gsk_vulkan_render_draw (GskVulkanRender *self);
GskVulkanOp * gsk_vulkan_render_draw_pass (GskVulkanRender *self,
GskVulkanRenderPass *render_pass,
GskVulkanOp *op,
VkCommandBuffer command_buffer);
GdkTexture * gsk_vulkan_render_download_target (GskVulkanRender *self);
VkFence gsk_vulkan_render_get_fence (GskVulkanRender *self);