AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-26 13:41:07 +00:00
Code Issues Projects Releases Wiki Activity

vulkan: Use VkPipeline instead of GskVulkanPipeline

Browse Source 
This is in preparation for getting rid of GskVulkanPipelines.
This commit is contained in:
Benjamin Otte 2023-06-26 23:26:19 +02:00
parent 8bacfad171
commit 7763e883d6
9 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gsk/vulkan/gskvulkancolormatrixop.c
View File

@ -91,12 +91,12 @@ gsk_vulkan_color_matrix_op_reserve_descriptor_sets (GskVulkanOp *op,
self->sampler_descriptor = gsk_vulkan_render_get_sampler_descriptor (render, GSK_VULKAN_SAMPLER_DEFAULT); self->sampler_descriptor = gsk_vulkan_render_get_sampler_descriptor (render, GSK_VULKAN_SAMPLER_DEFAULT);
} }
static GskVulkanPipeline * static VkPipeline
gsk_vulkan_color_matrix_op_get_pipeline (GskVulkanOp *op) gsk_vulkan_color_matrix_op_get_pipeline (GskVulkanOp *op)
{ {
GskVulkanColorMatrixOp *self = (GskVulkanColorMatrixOp *) op; GskVulkanColorMatrixOp *self = (GskVulkanColorMatrixOp *) op;
return self->pipeline; return gsk_vulkan_pipeline_get_pipeline (self->pipeline);
} }
static void static void

2
gsk/vulkan/gskvulkanoffscreenop.c
View File

@ -62,7 +62,7 @@ gsk_vulkan_offscreen_op_reserve_descriptor_sets (GskVulkanOp *op,
gsk_vulkan_render_pass_reserve_descriptor_sets (self->render_pass, render); gsk_vulkan_render_pass_reserve_descriptor_sets (self->render_pass, render);
} }
static GskVulkanPipeline * static VkPipeline
gsk_vulkan_offscreen_op_get_pipeline (GskVulkanOp *op) gsk_vulkan_offscreen_op_get_pipeline (GskVulkanOp *op)
{ {
return NULL; return NULL;

2
gsk/vulkan/gskvulkanop.c
View File

@ -49,7 +49,7 @@ gsk_vulkan_op_reserve_descriptor_sets (GskVulkanOp *op,
op->op_class->reserve_descriptor_sets (op, render); op->op_class->reserve_descriptor_sets (op, render);
} }
GskVulkanPipeline * VkPipeline
gsk_vulkan_op_get_pipeline (GskVulkanOp *op) gsk_vulkan_op_get_pipeline (GskVulkanOp *op)
{ {
return op->op_class->get_pipeline (op); return op->op_class->get_pipeline (op);

4
gsk/vulkan/gskvulkanopprivate.h
View File

@ -34,7 +34,7 @@ struct _GskVulkanOpClass
guchar *data); guchar *data);
void (* reserve_descriptor_sets) (GskVulkanOp *op, void (* reserve_descriptor_sets) (GskVulkanOp *op,
GskVulkanRender *render); GskVulkanRender *render);
GskVulkanPipeline * (* get_pipeline) (GskVulkanOp *op); VkPipeline (* get_pipeline) (GskVulkanOp *op);
void (* command) (GskVulkanOp *op, void (* command) (GskVulkanOp *op,
GskVulkanRender *render, GskVulkanRender *render,
VkPipelineLayout pipeline_layout, VkPipelineLayout pipeline_layout,
@ -62,7 +62,7 @@ void gsk_vulkan_op_collect_vertex_data (GskVulk
guchar *data); guchar *data);
void gsk_vulkan_op_reserve_descriptor_sets (GskVulkanOp *op, void gsk_vulkan_op_reserve_descriptor_sets (GskVulkanOp *op,
GskVulkanRender *render); GskVulkanRender *render);
GskVulkanPipeline * gsk_vulkan_op_get_pipeline (GskVulkanOp *op); VkPipeline gsk_vulkan_op_get_pipeline (GskVulkanOp *op);
void gsk_vulkan_op_command (GskVulkanOp *op, void gsk_vulkan_op_command (GskVulkanOp *op,
GskVulkanRender *render, GskVulkanRender *render,
VkPipelineLayout pipeline_layout, VkPipelineLayout pipeline_layout,

12
gsk/vulkan/gskvulkanrenderpass.c
View File

@ -2141,8 +2141,8 @@ gsk_vulkan_render_pass_draw_rect (GskVulkanRenderPass *self,
VkPipelineLayout pipeline_layout, VkPipelineLayout pipeline_layout,
VkCommandBuffer command_buffer) VkCommandBuffer command_buffer)
{ {
GskVulkanPipeline *current_pipeline = NULL; VkPipeline current_pipeline = VK_NULL_HANDLE;
GskVulkanPipeline *op_pipeline; VkPipeline op_pipeline;
GskVulkanOp *op; GskVulkanOp *op;
guint i; guint i;
GskVulkanBuffer *vertex_buffer; GskVulkanBuffer *vertex_buffer;
@ -2168,14 +2168,14 @@ gsk_vulkan_render_pass_draw_rect (GskVulkanRenderPass *self,
current_pipeline = op_pipeline; current_pipeline = op_pipeline;
vkCmdBindPipeline (command_buffer, vkCmdBindPipeline (command_buffer,
VK_PIPELINE_BIND_POINT_GRAPHICS, VK_PIPELINE_BIND_POINT_GRAPHICS,
gsk_vulkan_pipeline_get_pipeline (current_pipeline)); current_pipeline);
} }
gsk_vulkan_op_command (op, render, pipeline_layout, command_buffer); gsk_vulkan_op_command (op, render, pipeline_layout, command_buffer);
} }
} }
static GskVulkanPipeline * static VkPipeline
gsk_vulkan_render_op_get_pipeline (GskVulkanOp *op_) gsk_vulkan_render_op_get_pipeline (GskVulkanOp *op_)
{ {
GskVulkanOpAll *op = (GskVulkanOpAll *) op_; GskVulkanOpAll *op = (GskVulkanOpAll *) op_;
@ -2190,11 +2190,11 @@ gsk_vulkan_render_op_get_pipeline (GskVulkanOp *op_)
case GSK_VULKAN_OP_OUTSET_SHADOW: case GSK_VULKAN_OP_OUTSET_SHADOW:
case GSK_VULKAN_OP_CROSS_FADE: case GSK_VULKAN_OP_CROSS_FADE:
case GSK_VULKAN_OP_BLEND_MODE: case GSK_VULKAN_OP_BLEND_MODE:
return op->render.pipeline; return gsk_vulkan_pipeline_get_pipeline (op->render.pipeline);
case GSK_VULKAN_OP_TEXT: case GSK_VULKAN_OP_TEXT:
case GSK_VULKAN_OP_COLOR_TEXT: case GSK_VULKAN_OP_COLOR_TEXT:
return op->text.pipeline; return gsk_vulkan_pipeline_get_pipeline (op->text.pipeline);
case GSK_VULKAN_OP_PUSH_VERTEX_CONSTANTS: case GSK_VULKAN_OP_PUSH_VERTEX_CONSTANTS:
return NULL; return NULL;

2
gsk/vulkan/gskvulkanscissorop.c
View File

@ -47,7 +47,7 @@ gsk_vulkan_scissor_op_reserve_descriptor_sets (GskVulkanOp *op,
{ {
} }
static GskVulkanPipeline * static VkPipeline
gsk_vulkan_scissor_op_get_pipeline (GskVulkanOp *op) gsk_vulkan_scissor_op_get_pipeline (GskVulkanOp *op)
{ {
return NULL; return NULL;

4
gsk/vulkan/gskvulkantextureop.c
View File

@ -88,12 +88,12 @@ gsk_vulkan_texture_op_reserve_descriptor_sets (GskVulkanOp *op,
self->sampler_descriptor = gsk_vulkan_render_get_sampler_descriptor (render, self->sampler); self->sampler_descriptor = gsk_vulkan_render_get_sampler_descriptor (render, self->sampler);
} }
static GskVulkanPipeline * static VkPipeline
gsk_vulkan_texture_op_get_pipeline (GskVulkanOp *op) gsk_vulkan_texture_op_get_pipeline (GskVulkanOp *op)
{ {
GskVulkanTextureOp *self = (GskVulkanTextureOp *) op; GskVulkanTextureOp *self = (GskVulkanTextureOp *) op;
return self->pipeline; return gsk_vulkan_pipeline_get_pipeline (self->pipeline);
} }
static void static void

2
gsk/vulkan/gskvulkanuploadcairoop.c
View File

@ -81,7 +81,7 @@ gsk_vulkan_upload_cairo_op_reserve_descriptor_sets (GskVulkanOp *op,
{ {
} }
static GskVulkanPipeline * static VkPipeline
gsk_vulkan_upload_cairo_op_get_pipeline (GskVulkanOp *op) gsk_vulkan_upload_cairo_op_get_pipeline (GskVulkanOp *op)
{ {
return NULL; return NULL;

2
gsk/vulkan/gskvulkanuploadop.c
View File

@ -62,7 +62,7 @@ gsk_vulkan_upload_op_reserve_descriptor_sets (GskVulkanOp *op,
{ {
} }
static GskVulkanPipeline * static VkPipeline
gsk_vulkan_upload_op_get_pipeline (GskVulkanOp *op) gsk_vulkan_upload_op_get_pipeline (GskVulkanOp *op)
{ {
return NULL; return NULL;