From af014007f44baca453d4b2e7af750f21c2af9aca Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Tue, 26 Dec 2023 17:21:12 +0100 Subject: [PATCH] gl: Remove old Cairo fallback drawing code We use gsk_render_node_draw_fallback() now which does all of that for us. --- gsk/gl/gskglrenderer.c | 4 ---- gsk/gl/gskglrenderjob.c | 28 ---------------------------- gsk/gl/gskglrenderjobprivate.h | 2 -- 3 files changed, 34 deletions(-) diff --git a/gsk/gl/gskglrenderer.c b/gsk/gl/gskglrenderer.c index 8e48ca222f..163b4c5508 100644 --- a/gsk/gl/gskglrenderer.c +++ b/gsk/gl/gskglrenderer.c @@ -389,8 +389,6 @@ gsk_gl_renderer_render (GskRenderer *renderer, gsk_gl_driver_begin_frame (self->driver, self->command_queue); job = gsk_gl_render_job_new (self->driver, &viewport, scale, render_region, 0, clear_framebuffer); - if (GSK_RENDERER_DEBUG_CHECK (GSK_RENDERER (self), FALLBACK)) - gsk_gl_render_job_set_debug_fallback (job, TRUE); gsk_gl_render_job_render (job, root); gsk_gl_driver_end_frame (self->driver); gsk_gl_render_job_free (job); @@ -475,8 +473,6 @@ gsk_gl_renderer_render_texture (GskRenderer *renderer, { gsk_gl_driver_begin_frame (self->driver, self->command_queue); job = gsk_gl_render_job_new (self->driver, viewport, 1, NULL, render_target->framebuffer_id, TRUE); - if (GSK_RENDERER_DEBUG_CHECK (GSK_RENDERER (self), FALLBACK)) - gsk_gl_render_job_set_debug_fallback (job, TRUE); gsk_gl_render_job_render_flipped (job, root); texture_id = gsk_gl_driver_release_render_target (self->driver, render_target, FALSE); texture = gsk_gl_driver_create_gdk_texture (self->driver, texture_id, gdk_format); diff --git a/gsk/gl/gskglrenderjob.c b/gsk/gl/gskglrenderjob.c index 864a0435e2..a3e7c315ba 100644 --- a/gsk/gl/gskglrenderjob.c +++ b/gsk/gl/gskglrenderjob.c @@ -167,9 +167,6 @@ struct _GskGLRenderJob guint source_is_glyph_atlas : 1; - /* If we should be rendering red zones over fallback nodes */ - guint debug_fallback : 1; - /* In some cases we might want to avoid clearing the framebuffer * because we're going to render over the existing contents. */ @@ -1232,22 +1229,6 @@ gsk_gl_render_job_visit_as_fallback (GskGLRenderJob *job, cairo_rectangle (cr, 0, 0, surface_width / fabs (scale_x), surface_height / fabs (scale_y)); cairo_fill (cr); cairo_restore (cr); - - if (job->debug_fallback) - { - cairo_move_to (cr, 0, 0); - cairo_rectangle (cr, 0, 0, node->bounds.size.width, node->bounds.size.height); - if (GSK_RENDER_NODE_TYPE (node) == GSK_CAIRO_NODE) - cairo_set_source_rgba (cr, 0.3, 0, 1, 0.25); - else - cairo_set_source_rgba (cr, 1, 0, 0, 0.25); - cairo_fill_preserve (cr); - if (GSK_RENDER_NODE_TYPE (node) == GSK_CAIRO_NODE) - cairo_set_source_rgba (cr, 0.3, 0, 1, 1); - else - cairo_set_source_rgba (cr, 1, 0, 0, 1); - cairo_stroke (cr); - } cairo_destroy (cr); /* Create texture to upload */ @@ -4580,15 +4561,6 @@ gsk_gl_render_job_render (GskGLRenderJob *job, gdk_profiler_add_mark (start_time, GDK_PROFILER_CURRENT_TIME-start_time, "Execute GL command queue", ""); } -void -gsk_gl_render_job_set_debug_fallback (GskGLRenderJob *job, - gboolean debug_fallback) -{ - g_return_if_fail (job != NULL); - - job->debug_fallback = !!debug_fallback; -} - static int get_framebuffer_format (GdkGLContext *context, guint framebuffer) diff --git a/gsk/gl/gskglrenderjobprivate.h b/gsk/gl/gskglrenderjobprivate.h index 32edae12a3..2e38b07a2e 100644 --- a/gsk/gl/gskglrenderjobprivate.h +++ b/gsk/gl/gskglrenderjobprivate.h @@ -33,6 +33,4 @@ void gsk_gl_render_job_render (GskGLRenderJob *job GskRenderNode *root); void gsk_gl_render_job_render_flipped (GskGLRenderJob *job, GskRenderNode *root); -void gsk_gl_render_job_set_debug_fallback (GskGLRenderJob *job, - gboolean debug_fallback);