mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2024-12-26 13:41:07 +00:00
vulkan: Remove the VulkanOp.upload() vfunc
It's not used anymore.
This commit is contained in:
parent
93db1cc89e
commit
4954e6962f
@ -99,7 +99,6 @@ static const GskVulkanShaderOpClass GSK_VULKAN_BLEND_MODE_OP_CLASS = {
|
||||
&gsk_vulkan_blend_mode_info,
|
||||
gsk_vulkan_blend_mode_op_finish,
|
||||
gsk_vulkan_blend_mode_op_print,
|
||||
gsk_vulkan_op_draw_upload,
|
||||
gsk_vulkan_op_draw_count_vertex_data,
|
||||
gsk_vulkan_blend_mode_op_collect_vertex_data,
|
||||
gsk_vulkan_blend_mode_op_reserve_descriptor_sets,
|
||||
|
@ -73,7 +73,6 @@ static const GskVulkanOpClass GSK_VULKAN_BLUR_OP_CLASS = {
|
||||
&gsk_vulkan_blur_info,
|
||||
gsk_vulkan_blur_op_finish,
|
||||
gsk_vulkan_blur_op_print,
|
||||
gsk_vulkan_op_draw_upload,
|
||||
gsk_vulkan_op_draw_count_vertex_data,
|
||||
gsk_vulkan_blur_op_collect_vertex_data,
|
||||
gsk_vulkan_blur_op_reserve_descriptor_sets,
|
||||
|
@ -89,7 +89,6 @@ static const GskVulkanOpClass GSK_VULKAN_BORDER_OP_CLASS = {
|
||||
&gsk_vulkan_border_info,
|
||||
gsk_vulkan_border_op_finish,
|
||||
gsk_vulkan_border_op_print,
|
||||
gsk_vulkan_op_draw_upload,
|
||||
gsk_vulkan_op_draw_count_vertex_data,
|
||||
gsk_vulkan_border_op_collect_vertex_data,
|
||||
gsk_vulkan_border_op_reserve_descriptor_sets,
|
||||
|
@ -33,12 +33,6 @@ gsk_vulkan_clear_op_print (GskVulkanOp *op,
|
||||
print_newline (string);
|
||||
}
|
||||
|
||||
static void
|
||||
gsk_vulkan_clear_op_upload (GskVulkanOp *op,
|
||||
GskVulkanUploader *uploader)
|
||||
{
|
||||
}
|
||||
|
||||
static gsize
|
||||
gsk_vulkan_clear_op_count_vertex_data (GskVulkanOp *op,
|
||||
gsize n_bytes)
|
||||
@ -103,7 +97,6 @@ static const GskVulkanOpClass GSK_VULKAN_SCISSOR_OP_CLASS = {
|
||||
NULL,
|
||||
gsk_vulkan_clear_op_finish,
|
||||
gsk_vulkan_clear_op_print,
|
||||
gsk_vulkan_clear_op_upload,
|
||||
gsk_vulkan_clear_op_count_vertex_data,
|
||||
gsk_vulkan_clear_op_collect_vertex_data,
|
||||
gsk_vulkan_clear_op_reserve_descriptor_sets,
|
||||
|
@ -80,7 +80,6 @@ static const GskVulkanOpClass GSK_VULKAN_COLOR_MATRIX_OP_CLASS = {
|
||||
&gsk_vulkan_color_matrix_info,
|
||||
gsk_vulkan_color_matrix_op_finish,
|
||||
gsk_vulkan_color_matrix_op_print,
|
||||
gsk_vulkan_op_draw_upload,
|
||||
gsk_vulkan_op_draw_count_vertex_data,
|
||||
gsk_vulkan_color_matrix_op_collect_vertex_data,
|
||||
gsk_vulkan_color_matrix_op_reserve_descriptor_sets,
|
||||
|
@ -21,12 +21,6 @@ gsk_vulkan_color_op_finish (GskVulkanOp *op)
|
||||
{
|
||||
}
|
||||
|
||||
static void
|
||||
gsk_vulkan_color_op_upload (GskVulkanOp *op,
|
||||
GskVulkanUploader *uploader)
|
||||
{
|
||||
}
|
||||
|
||||
static void
|
||||
gsk_vulkan_color_op_print (GskVulkanOp *op,
|
||||
GString *string,
|
||||
@ -71,7 +65,6 @@ static const GskVulkanOpClass GSK_VULKAN_COLOR_OP_CLASS = {
|
||||
&gsk_vulkan_color_info,
|
||||
gsk_vulkan_color_op_finish,
|
||||
gsk_vulkan_color_op_print,
|
||||
gsk_vulkan_color_op_upload,
|
||||
gsk_vulkan_op_draw_count_vertex_data,
|
||||
gsk_vulkan_color_op_collect_vertex_data,
|
||||
gsk_vulkan_color_op_reserve_descriptor_sets,
|
||||
|
@ -84,7 +84,6 @@ static const GskVulkanOpClass GSK_VULKAN_CROSS_FADE_OP_CLASS = {
|
||||
&gsk_vulkan_cross_fade_info,
|
||||
gsk_vulkan_cross_fade_op_finish,
|
||||
gsk_vulkan_cross_fade_op_print,
|
||||
gsk_vulkan_op_draw_upload,
|
||||
gsk_vulkan_op_draw_count_vertex_data,
|
||||
gsk_vulkan_cross_fade_op_collect_vertex_data,
|
||||
gsk_vulkan_cross_fade_op_reserve_descriptor_sets,
|
||||
|
@ -71,7 +71,6 @@ static const GskVulkanOpClass GSK_VULKAN_GLYPH_OP_CLASS = {
|
||||
&gsk_vulkan_glyph_info,
|
||||
gsk_vulkan_glyph_op_finish,
|
||||
gsk_vulkan_glyph_op_print,
|
||||
gsk_vulkan_op_draw_upload,
|
||||
gsk_vulkan_op_draw_count_vertex_data,
|
||||
gsk_vulkan_glyph_op_collect_vertex_data,
|
||||
gsk_vulkan_glyph_op_reserve_descriptor_sets,
|
||||
|
@ -67,7 +67,6 @@ static const GskVulkanOpClass GSK_VULKAN_INSET_SHADOW_OP_CLASS = {
|
||||
&gsk_vulkan_inset_shadow_info,
|
||||
gsk_vulkan_inset_shadow_op_finish,
|
||||
gsk_vulkan_inset_shadow_op_print,
|
||||
gsk_vulkan_op_draw_upload,
|
||||
gsk_vulkan_op_draw_count_vertex_data,
|
||||
gsk_vulkan_inset_shadow_op_collect_vertex_data,
|
||||
gsk_vulkan_inset_shadow_op_reserve_descriptor_sets,
|
||||
|
@ -79,7 +79,6 @@ static const GskVulkanOpClass GSK_VULKAN_LINEAR_GRADIENT_OP_CLASS = {
|
||||
&gsk_vulkan_linear_info,
|
||||
gsk_vulkan_linear_gradient_op_finish,
|
||||
gsk_vulkan_linear_gradient_op_print,
|
||||
gsk_vulkan_op_draw_upload,
|
||||
gsk_vulkan_op_draw_count_vertex_data,
|
||||
gsk_vulkan_linear_gradient_op_collect_vertex_data,
|
||||
gsk_vulkan_linear_gradient_op_reserve_descriptor_sets,
|
||||
|
@ -95,7 +95,6 @@ static const GskVulkanOpClass GSK_VULKAN_COLOR_MASK_OP_CLASS = {
|
||||
&gsk_vulkan_mask_info,
|
||||
gsk_vulkan_mask_op_finish,
|
||||
gsk_vulkan_mask_op_print,
|
||||
gsk_vulkan_op_draw_upload,
|
||||
gsk_vulkan_op_draw_count_vertex_data,
|
||||
gsk_vulkan_mask_op_collect_vertex_data,
|
||||
gsk_vulkan_mask_op_reserve_descriptor_sets,
|
||||
|
@ -28,13 +28,6 @@ gsk_vulkan_op_print (GskVulkanOp *op,
|
||||
op->op_class->print (op, string, indent);
|
||||
}
|
||||
|
||||
void
|
||||
gsk_vulkan_op_upload (GskVulkanOp *op,
|
||||
GskVulkanUploader *uploader)
|
||||
{
|
||||
op->op_class->upload (op, uploader);
|
||||
}
|
||||
|
||||
gsize
|
||||
gsk_vulkan_op_count_vertex_data (GskVulkanOp *op,
|
||||
gsize n_bytes)
|
||||
@ -65,12 +58,6 @@ gsk_vulkan_op_command (GskVulkanOp *op,
|
||||
return op->op_class->command (op, render, pipeline_layout, command_buffer);
|
||||
}
|
||||
|
||||
void
|
||||
gsk_vulkan_op_draw_upload (GskVulkanOp *op,
|
||||
GskVulkanUploader *uploader)
|
||||
{
|
||||
}
|
||||
|
||||
static inline gsize
|
||||
round_up (gsize number, gsize divisor)
|
||||
{
|
||||
|
@ -38,8 +38,6 @@ struct _GskVulkanOpClass
|
||||
GString *string,
|
||||
guint indent);
|
||||
|
||||
void (* upload) (GskVulkanOp *op,
|
||||
GskVulkanUploader *uploader);
|
||||
gsize (* count_vertex_data) (GskVulkanOp *op,
|
||||
gsize n_bytes);
|
||||
void (* collect_vertex_data) (GskVulkanOp *op,
|
||||
@ -63,8 +61,6 @@ void gsk_vulkan_op_print (GskVulk
|
||||
GString *string,
|
||||
guint indent);
|
||||
|
||||
void gsk_vulkan_op_upload (GskVulkanOp *op,
|
||||
GskVulkanUploader *uploader);
|
||||
gsize gsk_vulkan_op_count_vertex_data (GskVulkanOp *op,
|
||||
gsize n_bytes);
|
||||
void gsk_vulkan_op_collect_vertex_data (GskVulkanOp *op,
|
||||
@ -76,8 +72,6 @@ GskVulkanOp * gsk_vulkan_op_command (GskVulk
|
||||
VkPipelineLayout pipeline_layout,
|
||||
VkCommandBuffer command_buffer);
|
||||
|
||||
void gsk_vulkan_op_draw_upload (GskVulkanOp *op,
|
||||
GskVulkanUploader *uploader);
|
||||
gsize gsk_vulkan_op_draw_count_vertex_data (GskVulkanOp *op,
|
||||
gsize n_bytes);
|
||||
GskVulkanOp * gsk_vulkan_op_draw_command_n (GskVulkanOp *op,
|
||||
|
@ -67,7 +67,6 @@ static const GskVulkanOpClass GSK_VULKAN_OUTSET_SHADOW_OP_CLASS = {
|
||||
&gsk_vulkan_outset_shadow_info,
|
||||
gsk_vulkan_outset_shadow_op_finish,
|
||||
gsk_vulkan_outset_shadow_op_print,
|
||||
gsk_vulkan_op_draw_upload,
|
||||
gsk_vulkan_op_draw_count_vertex_data,
|
||||
gsk_vulkan_outset_shadow_op_collect_vertex_data,
|
||||
gsk_vulkan_outset_shadow_op_reserve_descriptor_sets,
|
||||
|
@ -57,12 +57,6 @@ gsk_vulkan_push_constants_op_print (GskVulkanOp *op,
|
||||
print_newline (string);
|
||||
}
|
||||
|
||||
static void
|
||||
gsk_vulkan_push_constants_op_upload (GskVulkanOp *op,
|
||||
GskVulkanUploader *uploader)
|
||||
{
|
||||
}
|
||||
|
||||
static gsize
|
||||
gsk_vulkan_push_constants_op_count_vertex_data (GskVulkanOp *op,
|
||||
gsize n_bytes)
|
||||
@ -107,7 +101,6 @@ static const GskVulkanOpClass GSK_VULKAN_PUSH_CONSTANTS_OP_CLASS = {
|
||||
NULL,
|
||||
gsk_vulkan_push_constants_op_finish,
|
||||
gsk_vulkan_push_constants_op_print,
|
||||
gsk_vulkan_push_constants_op_upload,
|
||||
gsk_vulkan_push_constants_op_count_vertex_data,
|
||||
gsk_vulkan_push_constants_op_collect_vertex_data,
|
||||
gsk_vulkan_push_constants_op_reserve_descriptor_sets,
|
||||
|
@ -506,19 +506,6 @@ gsk_vulkan_render_add_node (GskVulkanRender *self,
|
||||
gsk_vulkan_render_verbose_print (self, "after sort");
|
||||
}
|
||||
|
||||
void
|
||||
gsk_vulkan_render_upload (GskVulkanRender *self)
|
||||
{
|
||||
GskVulkanOp *op;
|
||||
|
||||
for (op = self->first_op; op; op = op->next)
|
||||
{
|
||||
gsk_vulkan_op_upload (op, self->uploader);
|
||||
}
|
||||
|
||||
gsk_vulkan_uploader_upload (self->uploader);
|
||||
}
|
||||
|
||||
VkPipeline
|
||||
gsk_vulkan_render_get_pipeline (GskVulkanRender *self,
|
||||
const GskVulkanOpClass *op_class,
|
||||
|
@ -293,7 +293,6 @@ gsk_vulkan_renderer_render_texture (GskRenderer *renderer,
|
||||
rounded_viewport.size.height);
|
||||
|
||||
gsk_vulkan_render_reset (render, image, &rounded_viewport, NULL, root);
|
||||
gsk_vulkan_render_upload (render);
|
||||
gsk_vulkan_render_draw (render);
|
||||
|
||||
texture = gsk_vulkan_render_download_target (render);
|
||||
@ -352,7 +351,6 @@ gsk_vulkan_renderer_render (GskRenderer *renderer,
|
||||
draw_index = gdk_vulkan_context_get_draw_index (self->vulkan);
|
||||
|
||||
gsk_vulkan_render_reset (render, self->targets[draw_index], NULL, render_region, root);
|
||||
gsk_vulkan_render_upload (render);
|
||||
gsk_vulkan_render_draw (render);
|
||||
|
||||
#ifdef G_ENABLE_DEBUG
|
||||
|
@ -45,12 +45,6 @@ gsk_vulkan_render_pass_op_print (GskVulkanOp *op,
|
||||
print_newline (string);
|
||||
}
|
||||
|
||||
static void
|
||||
gsk_vulkan_render_pass_op_upload (GskVulkanOp *op,
|
||||
GskVulkanUploader *uploader)
|
||||
{
|
||||
}
|
||||
|
||||
static gsize
|
||||
gsk_vulkan_render_pass_op_count_vertex_data (GskVulkanOp *op,
|
||||
gsize n_bytes)
|
||||
@ -151,7 +145,6 @@ static const GskVulkanOpClass GSK_VULKAN_RENDER_PASS_OP_CLASS = {
|
||||
NULL,
|
||||
gsk_vulkan_render_pass_op_finish,
|
||||
gsk_vulkan_render_pass_op_print,
|
||||
gsk_vulkan_render_pass_op_upload,
|
||||
gsk_vulkan_render_pass_op_count_vertex_data,
|
||||
gsk_vulkan_render_pass_op_collect_vertex_data,
|
||||
gsk_vulkan_render_pass_op_reserve_descriptor_sets,
|
||||
@ -188,12 +181,6 @@ gsk_vulkan_render_pass_end_op_print (GskVulkanOp *op,
|
||||
print_newline (string);
|
||||
}
|
||||
|
||||
static void
|
||||
gsk_vulkan_render_pass_end_op_upload (GskVulkanOp *op,
|
||||
GskVulkanUploader *uploader)
|
||||
{
|
||||
}
|
||||
|
||||
static gsize
|
||||
gsk_vulkan_render_pass_end_op_count_vertex_data (GskVulkanOp *op,
|
||||
gsize n_bytes)
|
||||
@ -231,7 +218,6 @@ static const GskVulkanOpClass GSK_VULKAN_RENDER_PASS_END_OP_CLASS = {
|
||||
NULL,
|
||||
gsk_vulkan_render_pass_end_op_finish,
|
||||
gsk_vulkan_render_pass_end_op_print,
|
||||
gsk_vulkan_render_pass_end_op_upload,
|
||||
gsk_vulkan_render_pass_end_op_count_vertex_data,
|
||||
gsk_vulkan_render_pass_end_op_collect_vertex_data,
|
||||
gsk_vulkan_render_pass_end_op_reserve_descriptor_sets,
|
||||
|
@ -29,8 +29,6 @@ void gsk_vulkan_render_reset (GskVulk
|
||||
GskRenderer * gsk_vulkan_render_get_renderer (GskVulkanRender *self);
|
||||
GdkVulkanContext * gsk_vulkan_render_get_context (GskVulkanRender *self);
|
||||
|
||||
void gsk_vulkan_render_upload (GskVulkanRender *self);
|
||||
|
||||
gpointer gsk_vulkan_render_alloc_op (GskVulkanRender *self,
|
||||
gsize size);
|
||||
|
||||
|
@ -31,12 +31,6 @@ gsk_vulkan_scissor_op_print (GskVulkanOp *op,
|
||||
print_newline (string);
|
||||
}
|
||||
|
||||
static void
|
||||
gsk_vulkan_scissor_op_upload (GskVulkanOp *op,
|
||||
GskVulkanUploader *uploader)
|
||||
{
|
||||
}
|
||||
|
||||
static gsize
|
||||
gsk_vulkan_scissor_op_count_vertex_data (GskVulkanOp *op,
|
||||
gsize n_bytes)
|
||||
@ -82,7 +76,6 @@ static const GskVulkanOpClass GSK_VULKAN_SCISSOR_OP_CLASS = {
|
||||
NULL,
|
||||
gsk_vulkan_scissor_op_finish,
|
||||
gsk_vulkan_scissor_op_print,
|
||||
gsk_vulkan_scissor_op_upload,
|
||||
gsk_vulkan_scissor_op_count_vertex_data,
|
||||
gsk_vulkan_scissor_op_collect_vertex_data,
|
||||
gsk_vulkan_scissor_op_reserve_descriptor_sets,
|
||||
|
@ -76,7 +76,6 @@ static const GskVulkanOpClass GSK_VULKAN_TEXTURE_OP_CLASS = {
|
||||
&gsk_vulkan_texture_info,
|
||||
gsk_vulkan_texture_op_finish,
|
||||
gsk_vulkan_texture_op_print,
|
||||
gsk_vulkan_op_draw_upload,
|
||||
gsk_vulkan_op_draw_count_vertex_data,
|
||||
gsk_vulkan_texture_op_collect_vertex_data,
|
||||
gsk_vulkan_texture_op_reserve_descriptor_sets,
|
||||
|
@ -6,12 +6,6 @@
|
||||
|
||||
#include "gdk/gdkmemoryformatprivate.h"
|
||||
|
||||
static void
|
||||
gsk_vulkan_upload_op_upload (GskVulkanOp *op,
|
||||
GskVulkanUploader *uploader)
|
||||
{
|
||||
}
|
||||
|
||||
static gsize
|
||||
gsk_vulkan_upload_op_count_vertex_data (GskVulkanOp *op,
|
||||
gsize n_bytes)
|
||||
@ -264,7 +258,6 @@ static const GskVulkanOpClass GSK_VULKAN_UPLOAD_TEXTURE_OP_CLASS = {
|
||||
NULL,
|
||||
gsk_vulkan_upload_texture_op_finish,
|
||||
gsk_vulkan_upload_texture_op_print,
|
||||
gsk_vulkan_upload_op_upload,
|
||||
gsk_vulkan_upload_op_count_vertex_data,
|
||||
gsk_vulkan_upload_op_collect_vertex_data,
|
||||
gsk_vulkan_upload_op_reserve_descriptor_sets,
|
||||
@ -381,7 +374,6 @@ static const GskVulkanOpClass GSK_VULKAN_UPLOAD_CAIRO_OP_CLASS = {
|
||||
NULL,
|
||||
gsk_vulkan_upload_cairo_op_finish,
|
||||
gsk_vulkan_upload_cairo_op_print,
|
||||
gsk_vulkan_upload_op_upload,
|
||||
gsk_vulkan_upload_op_count_vertex_data,
|
||||
gsk_vulkan_upload_op_collect_vertex_data,
|
||||
gsk_vulkan_upload_op_reserve_descriptor_sets,
|
||||
@ -513,7 +505,6 @@ static const GskVulkanOpClass GSK_VULKAN_UPLOAD_GLYPH_OP_CLASS = {
|
||||
NULL,
|
||||
gsk_vulkan_upload_glyph_op_finish,
|
||||
gsk_vulkan_upload_glyph_op_print,
|
||||
gsk_vulkan_upload_op_upload,
|
||||
gsk_vulkan_upload_op_count_vertex_data,
|
||||
gsk_vulkan_upload_op_collect_vertex_data,
|
||||
gsk_vulkan_upload_op_reserve_descriptor_sets,
|
||||
|
Loading…
Reference in New Issue
Block a user