Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vulkan: Remove unused arguments from Op vfuncs

Browse Source 
Makes code a lot simpler.
This commit is contained in:
Benjamin Otte
2023-07-08 21:28:56 +02:00
parent 7fa159e94a
commit a6b2bcbf24
22 changed files with 66 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gsk/vulkan/gskvulkanblendmodeop.c
View File

@@ -48,10 +48,8 @@ gsk_vulkan_blend_mode_op_print (GskVulkanOp *op,
}
static void
gsk_vulkan_blend_mode_op_upload (GskVulkanOp *op,
GskVulkanRenderPass *pass,
GskVulkanRender *render,
GskVulkanUploader *uploader)
gsk_vulkan_blend_mode_op_upload (GskVulkanOp *op,
GskVulkanUploader *uploader)
{
}
@@ -76,10 +74,8 @@ gsk_vulkan_blend_mode_op_count_vertex_data (GskVulkanOp *op,
}
static void
gsk_vulkan_blend_mode_op_collect_vertex_data (GskVulkanOp *op,
GskVulkanRenderPass *pass,
GskVulkanRender *render,
guchar *data)
gsk_vulkan_blend_mode_op_collect_vertex_data (GskVulkanOp *op,
guchar *data)
{
GskVulkanBlendModeOp *self = (GskVulkanBlendModeOp *) op;
GskVulkanBlendModeInstance *instance = (GskVulkanBlendModeInstance *) (data + self->vertex_offset);

4
gsk/vulkan/gskvulkanblurop.c
View File

@@ -45,8 +45,6 @@ gsk_vulkan_blur_op_print (GskVulkanOp *op,
static void
gsk_vulkan_blur_op_upload (GskVulkanOp *op,
GskVulkanRenderPass *pass,
GskVulkanRender *render,
GskVulkanUploader *uploader)
{
}
@@ -73,8 +71,6 @@ gsk_vulkan_blur_op_count_vertex_data (GskVulkanOp *op,
static void
gsk_vulkan_blur_op_collect_vertex_data (GskVulkanOp *op,
GskVulkanRenderPass *pass,
GskVulkanRender *render,
guchar *data)
{
GskVulkanBlurOp *self = (GskVulkanBlurOp *) op;

12
gsk/vulkan/gskvulkanborderop.c
View File

@@ -54,10 +54,8 @@ gsk_vulkan_border_op_print (GskVulkanOp *op,
}
static void
gsk_vulkan_border_op_upload (GskVulkanOp *op,
GskVulkanRenderPass *pass,
GskVulkanRender *render,
GskVulkanUploader *uploader)
gsk_vulkan_border_op_upload (GskVulkanOp *op,
GskVulkanUploader *uploader)
{
}
@@ -82,10 +80,8 @@ gsk_vulkan_border_op_count_vertex_data (GskVulkanOp *op,
}
static void
gsk_vulkan_border_op_collect_vertex_data (GskVulkanOp *op,
GskVulkanRenderPass *pass,
GskVulkanRender *render,
guchar *data)
gsk_vulkan_border_op_collect_vertex_data (GskVulkanOp *op,
guchar *data)
{
GskVulkanBorderOp *self = (GskVulkanBorderOp *) op;
GskVulkanBorderInstance *instance = (GskVulkanBorderInstance *) (data + self->vertex_offset);

12
gsk/vulkan/gskvulkancolormatrixop.c
View File

@@ -44,10 +44,8 @@ gsk_vulkan_color_matrix_op_print (GskVulkanOp *op,
}
static void
gsk_vulkan_color_matrix_op_upload (GskVulkanOp *op,
GskVulkanRenderPass *pass,
GskVulkanRender *render,
GskVulkanUploader *uploader)
gsk_vulkan_color_matrix_op_upload (GskVulkanOp *op,
GskVulkanUploader *uploader)
{
}
@@ -72,10 +70,8 @@ gsk_vulkan_color_matrix_op_count_vertex_data (GskVulkanOp *op,
}
static void
gsk_vulkan_color_matrix_op_collect_vertex_data (GskVulkanOp *op,
GskVulkanRenderPass *pass,
GskVulkanRender *render,
guchar *data)
gsk_vulkan_color_matrix_op_collect_vertex_data (GskVulkanOp *op,
guchar *data)
{
GskVulkanColorMatrixOp *self = (GskVulkanColorMatrixOp *) op;
GskVulkanColorMatrixInstance *instance = (GskVulkanColorMatrixInstance *) (data + self->vertex_offset);

12
gsk/vulkan/gskvulkancolorop.c
View File

@@ -24,10 +24,8 @@ gsk_vulkan_color_op_finish (GskVulkanOp *op)
}
static void
gsk_vulkan_color_op_upload (GskVulkanOp *op,
GskVulkanRenderPass *pass,
GskVulkanRender *render,
GskVulkanUploader *uploader)
gsk_vulkan_color_op_upload (GskVulkanOp *op,
GskVulkanUploader *uploader)
{
}
@@ -66,10 +64,8 @@ gsk_vulkan_color_op_print (GskVulkanOp *op,
}
static void
gsk_vulkan_color_op_collect_vertex_data (GskVulkanOp *op,
GskVulkanRenderPass *pass,
GskVulkanRender *render,
guchar *data)
gsk_vulkan_color_op_collect_vertex_data (GskVulkanOp *op,
guchar *data)
{
GskVulkanColorOp *self = (GskVulkanColorOp *) op;
GskVulkanColorInstance *instance = (GskVulkanColorInstance *) (data + self->vertex_offset);

12
gsk/vulkan/gskvulkancrossfadeop.c
View File

@@ -48,10 +48,8 @@ gsk_vulkan_cross_fade_op_print (GskVulkanOp *op,
}
static void
gsk_vulkan_cross_fade_op_upload (GskVulkanOp *op,
GskVulkanRenderPass *pass,
GskVulkanRender *render,
GskVulkanUploader *uploader)
gsk_vulkan_cross_fade_op_upload (GskVulkanOp *op,
GskVulkanUploader *uploader)
{
}
@@ -76,10 +74,8 @@ gsk_vulkan_cross_fade_op_count_vertex_data (GskVulkanOp *op,
}
static void
gsk_vulkan_cross_fade_op_collect_vertex_data (GskVulkanOp *op,
GskVulkanRenderPass *pass,
GskVulkanRender *render,
guchar *data)
gsk_vulkan_cross_fade_op_collect_vertex_data (GskVulkanOp *op,
guchar *data)
{
GskVulkanCrossFadeOp *self = (GskVulkanCrossFadeOp *) op;
GskVulkanCrossFadeInstance *instance = (GskVulkanCrossFadeInstance *) (data + self->vertex_offset);

4
gsk/vulkan/gskvulkanglyphop.c
View File

@@ -31,8 +31,6 @@ gsk_vulkan_glyph_op_finish (GskVulkanOp *op)
static void
gsk_vulkan_glyph_op_upload (GskVulkanOp *op,
GskVulkanRenderPass *pass,
GskVulkanRender *render,
GskVulkanUploader *uploader)
{
}
@@ -73,8 +71,6 @@ gsk_vulkan_glyph_op_count_vertex_data (GskVulkanOp *op,
static void
gsk_vulkan_glyph_op_collect_vertex_data (GskVulkanOp *op,
GskVulkanRenderPass *pass,
GskVulkanRender *render,
guchar *data)
{
GskVulkanGlyphOp *self = (GskVulkanGlyphOp *) op;

12
gsk/vulkan/gskvulkaninsetshadowop.c
View File

@@ -43,10 +43,8 @@ gsk_vulkan_inset_shadow_op_print (GskVulkanOp *op,
}
static void
gsk_vulkan_inset_shadow_op_upload (GskVulkanOp *op,
GskVulkanRenderPass *pass,
GskVulkanRender *render,
GskVulkanUploader *uploader)
gsk_vulkan_inset_shadow_op_upload (GskVulkanOp *op,
GskVulkanUploader *uploader)
{
}
@@ -71,10 +69,8 @@ gsk_vulkan_inset_shadow_op_count_vertex_data (GskVulkanOp *op,
}
static void
gsk_vulkan_inset_shadow_op_collect_vertex_data (GskVulkanOp *op,
GskVulkanRenderPass *pass,
GskVulkanRender *render,
guchar *data)
gsk_vulkan_inset_shadow_op_collect_vertex_data (GskVulkanOp *op,
guchar *data)
{
GskVulkanInsetShadowOp *self = (GskVulkanInsetShadowOp *) op;
GskVulkanInsetShadowInstance *instance = (GskVulkanInsetShadowInstance *) (data + self->vertex_offset);

4
gsk/vulkan/gskvulkanlineargradientop.c
View File

@@ -46,8 +46,6 @@ gsk_vulkan_linear_gradient_op_print (GskVulkanOp *op,
static void
gsk_vulkan_linear_gradient_op_upload (GskVulkanOp *op,
GskVulkanRenderPass *pass,
GskVulkanRender *render,
GskVulkanUploader *uploader)
{
}
@@ -74,8 +72,6 @@ gsk_vulkan_linear_gradient_op_count_vertex_data (GskVulkanOp *op,
static void
gsk_vulkan_linear_gradient_op_collect_vertex_data (GskVulkanOp *op,
GskVulkanRenderPass *pass,
GskVulkanRender *render,
guchar *data)
{
GskVulkanLinearGradientOp *self = (GskVulkanLinearGradientOp *) op;

12
gsk/vulkan/gskvulkanmaskop.c
View File

@@ -65,10 +65,8 @@ gsk_vulkan_mask_op_print (GskVulkanOp *op,
}
static void
gsk_vulkan_mask_op_upload (GskVulkanOp *op,
GskVulkanRenderPass *pass,
GskVulkanRender *render,
GskVulkanUploader *uploader)
gsk_vulkan_mask_op_upload (GskVulkanOp *op,
GskVulkanUploader *uploader)
{
}
@@ -93,10 +91,8 @@ gsk_vulkan_mask_op_count_vertex_data (GskVulkanOp *op,
}
static void
gsk_vulkan_mask_op_collect_vertex_data (GskVulkanOp *op,
GskVulkanRenderPass *pass,
GskVulkanRender *render,
guchar *data)
gsk_vulkan_mask_op_collect_vertex_data (GskVulkanOp *op,
guchar *data)
{
GskVulkanMaskOp *self = (GskVulkanMaskOp *) op;
GskVulkanMaskInstance *instance = (GskVulkanMaskInstance *) (data + self->vertex_offset);

28
gsk/vulkan/gskvulkanoffscreenop.c
View File

@@ -43,14 +43,12 @@ gsk_vulkan_offscreen_op_print (GskVulkanOp *op,
}
static void
gsk_vulkan_offscreen_op_upload (GskVulkanOp *op,
GskVulkanRenderPass *pass,
GskVulkanRender *render,
GskVulkanUploader *uploader)
gsk_vulkan_offscreen_op_upload (GskVulkanOp *op,
GskVulkanUploader *uploader)
{
GskVulkanOffscreenOp *self = (GskVulkanOffscreenOp *) op;
gsk_vulkan_render_pass_upload (self->render_pass, render, uploader);
gsk_vulkan_render_pass_upload (self->render_pass, uploader);
}
static gsize
@@ -63,14 +61,12 @@ gsk_vulkan_offscreen_op_count_vertex_data (GskVulkanOp *op,
}
static void
gsk_vulkan_offscreen_op_collect_vertex_data (GskVulkanOp *op,
GskVulkanRenderPass *pass,
GskVulkanRender *render,
guchar *data)
gsk_vulkan_offscreen_op_collect_vertex_data (GskVulkanOp *op,
guchar *data)
{
GskVulkanOffscreenOp *self = (GskVulkanOffscreenOp *) op;
gsk_vulkan_render_pass_collect_vertex_data (self->render_pass, render, data);
gsk_vulkan_render_pass_collect_vertex_data (self->render_pass, data);
}
static void
@@ -137,10 +133,8 @@ gsk_vulkan_offscreen_end_op_print (GskVulkanOp *op,
}
static void
gsk_vulkan_offscreen_end_op_upload (GskVulkanOp *op,
GskVulkanRenderPass *pass,
GskVulkanRender *render,
GskVulkanUploader *uploader)
gsk_vulkan_offscreen_end_op_upload (GskVulkanOp *op,
GskVulkanUploader *uploader)
{
}
@@ -152,10 +146,8 @@ gsk_vulkan_offscreen_end_op_count_vertex_data (GskVulkanOp *op,
}
static void
gsk_vulkan_offscreen_end_op_collect_vertex_data (GskVulkanOp *op,
GskVulkanRenderPass *pass,
GskVulkanRender *render,
guchar *data)
gsk_vulkan_offscreen_end_op_collect_vertex_data (GskVulkanOp *op,
guchar *data)
{
}

12
gsk/vulkan/gskvulkanop.c
View File

@@ -31,11 +31,9 @@ gsk_vulkan_op_print (GskVulkanOp *op,
void
gsk_vulkan_op_upload (GskVulkanOp *op,
GskVulkanRenderPass *pass,
GskVulkanRender *render,
GskVulkanUploader *uploader)
{
op->op_class->upload (op, pass, render, uploader);
op->op_class->upload (op, uploader);
}
gsize
@@ -46,12 +44,10 @@ gsk_vulkan_op_count_vertex_data (GskVulkanOp *op,
}
void
gsk_vulkan_op_collect_vertex_data (GskVulkanOp *op,
GskVulkanRenderPass *pass,
GskVulkanRender *render,
guchar *data)
gsk_vulkan_op_collect_vertex_data (GskVulkanOp *op,
guchar *data)
{
op->op_class->collect_vertex_data (op, pass, render, data);
op->op_class->collect_vertex_data (op, data);
}
void

8
gsk/vulkan/gskvulkanopprivate.h
View File

@@ -30,14 +30,10 @@ struct _GskVulkanOpClass
guint indent);
void (* upload) (GskVulkanOp *op,
GskVulkanRenderPass *pass,
GskVulkanRender *render,
GskVulkanUploader *uploader);
gsize (* count_vertex_data) (GskVulkanOp *op,
gsize n_bytes);
void (* collect_vertex_data) (GskVulkanOp *op,
GskVulkanRenderPass *pass,
GskVulkanRender *render,
guchar *data);
void (* reserve_descriptor_sets) (GskVulkanOp *op,
GskVulkanRender *render);
@@ -59,14 +55,10 @@ void gsk_vulkan_op_print (GskVulk
guint indent);
void gsk_vulkan_op_upload (GskVulkanOp *op,
GskVulkanRenderPass *pass,
GskVulkanRender *render,
GskVulkanUploader *uploader);
gsize gsk_vulkan_op_count_vertex_data (GskVulkanOp *op,
gsize n_bytes);
void gsk_vulkan_op_collect_vertex_data (GskVulkanOp *op,
GskVulkanRenderPass *pass,
GskVulkanRender *render,
guchar *data);
void gsk_vulkan_op_reserve_descriptor_sets (GskVulkanOp *op,
GskVulkanRender *render);

12
gsk/vulkan/gskvulkanoutsetshadowop.c
View File

@@ -43,10 +43,8 @@ gsk_vulkan_outset_shadow_op_print (GskVulkanOp *op,
}
static void
gsk_vulkan_outset_shadow_op_upload (GskVulkanOp *op,
GskVulkanRenderPass *pass,
GskVulkanRender *render,
GskVulkanUploader *uploader)
gsk_vulkan_outset_shadow_op_upload (GskVulkanOp *op,
GskVulkanUploader *uploader)
{
}
@@ -71,10 +69,8 @@ gsk_vulkan_outset_shadow_op_count_vertex_data (GskVulkanOp *op,
}
static void
gsk_vulkan_outset_shadow_op_collect_vertex_data (GskVulkanOp *op,
GskVulkanRenderPass *pass,
GskVulkanRender *render,
guchar *data)
gsk_vulkan_outset_shadow_op_collect_vertex_data (GskVulkanOp *op,
guchar *data)
{
GskVulkanOutsetShadowOp *self = (GskVulkanOutsetShadowOp *) op;
GskVulkanOutsetShadowInstance *instance = (GskVulkanOutsetShadowInstance *) (data + self->vertex_offset);

12
gsk/vulkan/gskvulkanpushconstantsop.c
View File

@@ -58,10 +58,8 @@ gsk_vulkan_push_constants_op_print (GskVulkanOp *op,
}
static void
gsk_vulkan_push_constants_op_upload (GskVulkanOp *op,
GskVulkanRenderPass *pass,
GskVulkanRender *render,
GskVulkanUploader *uploader)
gsk_vulkan_push_constants_op_upload (GskVulkanOp *op,
GskVulkanUploader *uploader)
{
}
@@ -73,10 +71,8 @@ gsk_vulkan_push_constants_op_count_vertex_data (GskVulkanOp *op,
}
static void
gsk_vulkan_push_constants_op_collect_vertex_data (GskVulkanOp *op,
GskVulkanRenderPass *pass,
GskVulkanRender *render,
guchar *data)
gsk_vulkan_push_constants_op_collect_vertex_data (GskVulkanOp *op,
guchar *data)
{
}

4
gsk/vulkan/gskvulkanrender.c
View File

@@ -383,7 +383,7 @@ gsk_vulkan_render_upload (GskVulkanRender *self)
gsk_vulkan_glyph_cache_upload (gsk_vulkan_renderer_get_glyph_cache (GSK_VULKAN_RENDERER (self->renderer)),
self->uploader);
gsk_vulkan_render_pass_upload (self->render_pass, self, self->uploader);
gsk_vulkan_render_pass_upload (self->render_pass, self->uploader);
gsk_vulkan_uploader_upload (self->uploader);
}
@@ -756,7 +756,7 @@ gsk_vulkan_render_collect_vertex_buffer (GskVulkanRender *self)
self->vertex_buffer = gsk_vulkan_buffer_new (self->vulkan, round_up (n_bytes, VERTEX_BUFFER_SIZE_STEP));
data = gsk_vulkan_buffer_map (self->vertex_buffer);
gsk_vulkan_render_pass_collect_vertex_data (self->render_pass, self, data);
gsk_vulkan_render_pass_collect_vertex_data (self->render_pass, data);
gsk_vulkan_buffer_unmap (self->vertex_buffer);
}

6
gsk/vulkan/gskvulkanrenderpass.c
View File

@@ -1352,14 +1352,13 @@ gsk_vulkan_render_pass_get_first_op (GskVulkanRenderPass *self)
void
gsk_vulkan_render_pass_upload (GskVulkanRenderPass *self,
GskVulkanRender *render,
GskVulkanUploader *uploader)
{
GskVulkanOp *op;
for (op = gsk_vulkan_render_pass_get_first_op (self); op; op = op->next)
{
gsk_vulkan_op_upload (op, self, render, uploader);
gsk_vulkan_op_upload (op, uploader);
}
}
@@ -1379,14 +1378,13 @@ gsk_vulkan_render_pass_count_vertex_data (GskVulkanRenderPass *self,
void
gsk_vulkan_render_pass_collect_vertex_data (GskVulkanRenderPass *self,
GskVulkanRender *render,
guchar *data)
{
GskVulkanOp *op;
for (op = gsk_vulkan_render_pass_get_first_op (self); op; op = op->next)
{
gsk_vulkan_op_collect_vertex_data (op, self, render, data);
gsk_vulkan_op_collect_vertex_data (op, data);
}
}

2
gsk/vulkan/gskvulkanrenderpassprivate.h
View File

@@ -29,14 +29,12 @@ gpointer gsk_vulkan_render_pass_alloc_op (GskVulk
gsize size);
void gsk_vulkan_render_pass_upload (GskVulkanRenderPass *self,
GskVulkanRender *render,
GskVulkanUploader *uploader);
void gsk_vulkan_render_pass_reserve_descriptor_sets (GskVulkanRenderPass *self,
GskVulkanRender *render);
gsize gsk_vulkan_render_pass_count_vertex_data (GskVulkanRenderPass *self,
gsize n_bytes);
void gsk_vulkan_render_pass_collect_vertex_data (GskVulkanRenderPass *self,
GskVulkanRender *render,
guchar *data);
void gsk_vulkan_render_pass_draw (GskVulkanRenderPass *self,
GskVulkanRender *render,

12
gsk/vulkan/gskvulkanscissorop.c
View File

@@ -32,10 +32,8 @@ gsk_vulkan_scissor_op_print (GskVulkanOp *op,
}
static void
gsk_vulkan_scissor_op_upload (GskVulkanOp *op,
GskVulkanRenderPass *pass,
GskVulkanRender *render,
GskVulkanUploader *uploader)
gsk_vulkan_scissor_op_upload (GskVulkanOp *op,
GskVulkanUploader *uploader)
{
}
@@ -47,10 +45,8 @@ gsk_vulkan_scissor_op_count_vertex_data (GskVulkanOp *op,
}
static void
gsk_vulkan_scissor_op_collect_vertex_data (GskVulkanOp *op,
GskVulkanRenderPass *pass,
GskVulkanRender *render,
guchar *data)
gsk_vulkan_scissor_op_collect_vertex_data (GskVulkanOp *op,
guchar *data)
{
}

12
gsk/vulkan/gskvulkantextureop.c
View File

@@ -44,10 +44,8 @@ gsk_vulkan_texture_op_print (GskVulkanOp *op,
}
static void
gsk_vulkan_texture_op_upload (GskVulkanOp *op,
GskVulkanRenderPass *pass,
GskVulkanRender *render,
GskVulkanUploader *uploader)
gsk_vulkan_texture_op_upload (GskVulkanOp *op,
GskVulkanUploader *uploader)
{
}
@@ -72,10 +70,8 @@ gsk_vulkan_texture_op_count_vertex_data (GskVulkanOp *op,
}
static void
gsk_vulkan_texture_op_collect_vertex_data (GskVulkanOp *op,
GskVulkanRenderPass *pass,
GskVulkanRender *render,
guchar *data)
gsk_vulkan_texture_op_collect_vertex_data (GskVulkanOp *op,
guchar *data)
{
GskVulkanTextureOp *self = (GskVulkanTextureOp *) op;
GskVulkanTextureInstance *instance = (GskVulkanTextureInstance *) (data + self->vertex_offset);

12
gsk/vulkan/gskvulkanuploadcairoop.c
View File

@@ -38,10 +38,8 @@ gsk_vulkan_upload_cairo_op_print (GskVulkanOp *op,
}
static void
gsk_vulkan_upload_cairo_op_upload (GskVulkanOp *op,
GskVulkanRenderPass *pass,
GskVulkanRender *render,
GskVulkanUploader *uploader)
gsk_vulkan_upload_cairo_op_upload (GskVulkanOp *op,
GskVulkanUploader *uploader)
{
GskVulkanUploadCairoOp *self = (GskVulkanUploadCairoOp *) op;
GskVulkanImageMap map;
@@ -81,10 +79,8 @@ gsk_vulkan_upload_cairo_op_count_vertex_data (GskVulkanOp *op,
}
static void
gsk_vulkan_upload_cairo_op_collect_vertex_data (GskVulkanOp *op,
GskVulkanRenderPass *pass,
GskVulkanRender *render,
guchar *data)
gsk_vulkan_upload_cairo_op_collect_vertex_data (GskVulkanOp *op,
guchar *data)
{
}

4
gsk/vulkan/gskvulkanuploadop.c
View File

@@ -38,8 +38,6 @@ gsk_vulkan_upload_op_print (GskVulkanOp *op,
static void
gsk_vulkan_upload_op_upload (GskVulkanOp *op,
GskVulkanRenderPass *pass,
GskVulkanRender *render,
GskVulkanUploader *uploader)
{
GskVulkanUploadOp *self = (GskVulkanUploadOp *) op;
@@ -63,8 +61,6 @@ gsk_vulkan_upload_op_count_vertex_data (GskVulkanOp *op,
static void
gsk_vulkan_upload_op_collect_vertex_data (GskVulkanOp *op,
GskVulkanRenderPass *pass,
GskVulkanRender *render,
guchar *data)
{
}