vulkan: Remove hacky function arguments

They're unused now that we removed the old render ops.
This commit is contained in:
Benjamin Otte
2023-07-03 03:23:17 +02:00
parent 5e72914c48
commit efa4cae949
17 changed files with 23 additions and 68 deletions

View File

@@ -36,9 +36,7 @@ static void
gsk_vulkan_blend_mode_op_upload (GskVulkanOp *op,
GskVulkanRenderPass *pass,
GskVulkanRender *render,
GskVulkanUploader *uploader,
const graphene_rect_t *clip,
const graphene_vec2_t *scale)
GskVulkanUploader *uploader)
{
}

View File

@@ -31,9 +31,7 @@ static void
gsk_vulkan_blur_op_upload (GskVulkanOp *op,
GskVulkanRenderPass *pass,
GskVulkanRender *render,
GskVulkanUploader *uploader,
const graphene_rect_t *clip,
const graphene_vec2_t *scale)
GskVulkanUploader *uploader)
{
}

View File

@@ -28,9 +28,7 @@ static void
gsk_vulkan_border_op_upload (GskVulkanOp *op,
GskVulkanRenderPass *pass,
GskVulkanRender *render,
GskVulkanUploader *uploader,
const graphene_rect_t *clip,
const graphene_vec2_t *scale)
GskVulkanUploader *uploader)
{
}

View File

@@ -32,9 +32,7 @@ static void
gsk_vulkan_color_matrix_op_upload (GskVulkanOp *op,
GskVulkanRenderPass *pass,
GskVulkanRender *render,
GskVulkanUploader *uploader,
const graphene_rect_t *clip,
const graphene_vec2_t *scale)
GskVulkanUploader *uploader)
{
}

View File

@@ -25,9 +25,7 @@ static void
gsk_vulkan_color_op_upload (GskVulkanOp *op,
GskVulkanRenderPass *pass,
GskVulkanRender *render,
GskVulkanUploader *uploader,
const graphene_rect_t *clip,
const graphene_vec2_t *scale)
GskVulkanUploader *uploader)
{
}

View File

@@ -36,9 +36,7 @@ static void
gsk_vulkan_cross_fade_op_upload (GskVulkanOp *op,
GskVulkanRenderPass *pass,
GskVulkanRender *render,
GskVulkanUploader *uploader,
const graphene_rect_t *clip,
const graphene_vec2_t *scale)
GskVulkanUploader *uploader)
{
}

View File

@@ -30,9 +30,7 @@ static void
gsk_vulkan_inset_shadow_op_upload (GskVulkanOp *op,
GskVulkanRenderPass *pass,
GskVulkanRender *render,
GskVulkanUploader *uploader,
const graphene_rect_t *clip,
const graphene_vec2_t *scale)
GskVulkanUploader *uploader)
{
}

View File

@@ -33,9 +33,7 @@ static void
gsk_vulkan_linear_gradient_op_upload (GskVulkanOp *op,
GskVulkanRenderPass *pass,
GskVulkanRender *render,
GskVulkanUploader *uploader,
const graphene_rect_t *clip,
const graphene_vec2_t *scale)
GskVulkanUploader *uploader)
{
}

View File

@@ -29,9 +29,7 @@ static void
gsk_vulkan_offscreen_op_upload (GskVulkanOp *op,
GskVulkanRenderPass *pass,
GskVulkanRender *render,
GskVulkanUploader *uploader,
const graphene_rect_t *clip,
const graphene_vec2_t *scale)
GskVulkanUploader *uploader)
{
GskVulkanOffscreenOp *self = (GskVulkanOffscreenOp *) op;

View File

@@ -22,14 +22,12 @@ gsk_vulkan_op_finish (GskVulkanOp *op)
}
void
gsk_vulkan_op_upload (GskVulkanOp *op,
GskVulkanRenderPass *pass,
GskVulkanRender *render,
GskVulkanUploader *uploader,
const graphene_rect_t *clip,
const graphene_vec2_t *scale)
gsk_vulkan_op_upload (GskVulkanOp *op,
GskVulkanRenderPass *pass,
GskVulkanRender *render,
GskVulkanUploader *uploader)
{
op->op_class->upload (op, pass, render, uploader, clip, scale);
op->op_class->upload (op, pass, render, uploader);
}
gsize

View File

@@ -28,9 +28,7 @@ struct _GskVulkanOpClass
void (* upload) (GskVulkanOp *op,
GskVulkanRenderPass *pass,
GskVulkanRender *render,
GskVulkanUploader *uploader,
const graphene_rect_t *clip,
const graphene_vec2_t *scale);
GskVulkanUploader *uploader);
gsize (* count_vertex_data) (GskVulkanOp *op,
gsize n_bytes);
void (* collect_vertex_data) (GskVulkanOp *op,
@@ -56,9 +54,7 @@ void gsk_vulkan_op_finish (GskVulk
void gsk_vulkan_op_upload (GskVulkanOp *op,
GskVulkanRenderPass *pass,
GskVulkanRender *render,
GskVulkanUploader *uploader,
const graphene_rect_t *clip,
const graphene_vec2_t *scale);
GskVulkanUploader *uploader);
gsize gsk_vulkan_op_count_vertex_data (GskVulkanOp *op,
gsize n_bytes);
void gsk_vulkan_op_collect_vertex_data (GskVulkanOp *op,

View File

@@ -30,9 +30,7 @@ static void
gsk_vulkan_outset_shadow_op_upload (GskVulkanOp *op,
GskVulkanRenderPass *pass,
GskVulkanRender *render,
GskVulkanUploader *uploader,
const graphene_rect_t *clip,
const graphene_vec2_t *scale)
GskVulkanUploader *uploader)
{
}

View File

@@ -1424,21 +1424,12 @@ gsk_vulkan_render_pass_upload (GskVulkanRenderPass *self,
{
GskVulkanOp *op;
guint i;
const graphene_rect_t *clip = NULL;
const graphene_vec2_t *scale = NULL;
for (i = 0; i < gsk_vulkan_render_ops_get_size (&self->render_ops); i += op->op_class->size)
{
op = (GskVulkanOp *) gsk_vulkan_render_ops_index (&self->render_ops, i);
gsk_vulkan_op_upload (op, self, render, uploader, clip, scale);
if (((GskVulkanOpAny *) op)->type == GSK_VULKAN_OP_PUSH_VERTEX_CONSTANTS)
{
GskVulkanOpPushConstants *constants = (GskVulkanOpPushConstants *) op;
clip = &constants->clip.bounds;
scale = &constants->scale;
}
gsk_vulkan_op_upload (op, self, render, uploader);
}
}
@@ -1446,9 +1437,7 @@ static void
gsk_vulkan_render_op_upload (GskVulkanOp *op_,
GskVulkanRenderPass *self,
GskVulkanRender *render,
GskVulkanUploader *uploader,
const graphene_rect_t *clip,
const graphene_vec2_t *scale)
GskVulkanUploader *uploader)
{
GskVulkanOpAll *op = (GskVulkanOpAll *) op_;

View File

@@ -20,9 +20,7 @@ static void
gsk_vulkan_scissor_op_upload (GskVulkanOp *op,
GskVulkanRenderPass *pass,
GskVulkanRender *render,
GskVulkanUploader *uploader,
const graphene_rect_t *clip,
const graphene_vec2_t *scale)
GskVulkanUploader *uploader)
{
}

View File

@@ -31,9 +31,7 @@ static void
gsk_vulkan_texture_op_upload (GskVulkanOp *op,
GskVulkanRenderPass *pass,
GskVulkanRender *render,
GskVulkanUploader *uploader,
const graphene_rect_t *clip,
const graphene_vec2_t *scale)
GskVulkanUploader *uploader)
{
}

View File

@@ -26,9 +26,7 @@ static void
gsk_vulkan_upload_cairo_op_upload (GskVulkanOp *op,
GskVulkanRenderPass *pass,
GskVulkanRender *render,
GskVulkanUploader *uploader,
const graphene_rect_t *clip,
const graphene_vec2_t *scale)
GskVulkanUploader *uploader)
{
GskVulkanUploadCairoOp *self = (GskVulkanUploadCairoOp *) op;
GskVulkanImageMap map;

View File

@@ -25,9 +25,7 @@ static void
gsk_vulkan_upload_op_upload (GskVulkanOp *op,
GskVulkanRenderPass *pass,
GskVulkanRender *render,
GskVulkanUploader *uploader,
const graphene_rect_t *clip,
const graphene_vec2_t *scale)
GskVulkanUploader *uploader)
{
GskVulkanUploadOp *self = (GskVulkanUploadOp *) op;
GdkTextureDownloader *downloader;