From b1fb7cd4ae2ff147731c8464c44a26b3f36262ad Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 16 Mar 2024 09:08:20 -0400 Subject: [PATCH] gsk: Drop unused debug flags The 'surface', 'sync' and 'opengl' flags are not used anywhere. --- docs/reference/gtk/running.md | 6 ------ gsk/gskdebug.c | 3 --- gsk/gskdebugprivate.h | 21 +++++++++------------ gtk/inspector/logs.c | 6 ------ gtk/inspector/logs.ui | 12 ------------ 5 files changed, 9 insertions(+), 39 deletions(-) diff --git a/docs/reference/gtk/running.md b/docs/reference/gtk/running.md index f13f3dbe95..570da218c8 100644 --- a/docs/reference/gtk/running.md +++ b/docs/reference/gtk/running.md @@ -283,9 +283,6 @@ are only available when GTK has been configured with `-Ddebug=true`. `shaders` : Information about shaders -`surface` -: Information about surfaces - `fallback` : Information about fallback usage in renderers @@ -303,9 +300,6 @@ A number of options affect behavior instead of logging: `full-redraw` : Force full redraws -`sync` -: Sync after each frame - `staging` : Use a staging image for texture upload (Vulkan only) diff --git a/gsk/gskdebug.c b/gsk/gskdebug.c index 36692b07e5..5b5cd0143f 100644 --- a/gsk/gskdebug.c +++ b/gsk/gskdebug.c @@ -5,16 +5,13 @@ static const GdkDebugKey gsk_debug_keys[] = { { "renderer", GSK_DEBUG_RENDERER, "General renderer information" }, - { "opengl", GSK_DEBUG_OPENGL, "OpenGL renderer information" }, { "vulkan", GSK_DEBUG_VULKAN, "Vulkan renderer information" }, { "shaders", GSK_DEBUG_SHADERS, "Information about shaders" }, - { "surface", GSK_DEBUG_SURFACE, "Information about surfaces" }, { "fallback", GSK_DEBUG_FALLBACK, "Information about fallback usage in renderers" }, { "glyphcache", GSK_DEBUG_GLYPH_CACHE, "Information about glyph caching" }, { "verbose", GSK_DEBUG_VERBOSE, "Print verbose output while rendering" }, { "geometry", GSK_DEBUG_GEOMETRY, "Show borders (when using cairo)" }, { "full-redraw", GSK_DEBUG_FULL_REDRAW, "Force full redraws" }, - { "sync", GSK_DEBUG_SYNC, "Sync after each frame" }, { "staging", GSK_DEBUG_STAGING, "Use a staging image for texture upload (Vulkan only)" }, { "offload-disable", GSK_DEBUG_OFFLOAD_DISABLE, "Disable graphics offload" }, { "cairo", GSK_DEBUG_CAIRO, "Overlay error pattern over Cairo drawing (finds fallbacks)" }, diff --git a/gsk/gskdebugprivate.h b/gsk/gskdebugprivate.h index 3a66d216b5..fe0bcba8cc 100644 --- a/gsk/gskdebugprivate.h +++ b/gsk/gskdebugprivate.h @@ -7,20 +7,17 @@ G_BEGIN_DECLS typedef enum { GSK_DEBUG_RENDERER = 1 << 0, - GSK_DEBUG_OPENGL = 1 << 1, GSK_DEBUG_SHADERS = 1 << 2, - GSK_DEBUG_SURFACE = 1 << 3, - GSK_DEBUG_VULKAN = 1 << 4, - GSK_DEBUG_FALLBACK = 1 << 5, - GSK_DEBUG_GLYPH_CACHE = 1 << 6, - GSK_DEBUG_VERBOSE = 1 << 7, + GSK_DEBUG_VULKAN = 1 << 3, + GSK_DEBUG_FALLBACK = 1 << 4, + GSK_DEBUG_GLYPH_CACHE = 1 << 5, + GSK_DEBUG_VERBOSE = 1 << 6, /* flags below may affect behavior */ - GSK_DEBUG_GEOMETRY = 1 << 8, - GSK_DEBUG_FULL_REDRAW = 1 << 9, - GSK_DEBUG_SYNC = 1 << 10, - GSK_DEBUG_STAGING = 1 << 11, - GSK_DEBUG_OFFLOAD_DISABLE = 1 << 12, - GSK_DEBUG_CAIRO = 1 << 13, + GSK_DEBUG_GEOMETRY = 1 << 7, + GSK_DEBUG_FULL_REDRAW = 1 << 8, + GSK_DEBUG_STAGING = 1 << 10, + GSK_DEBUG_OFFLOAD_DISABLE = 1 << 11, + GSK_DEBUG_CAIRO = 1 << 12, } GskDebugFlags; #define GSK_DEBUG_ANY ((1 << 13) - 1) diff --git a/gtk/inspector/logs.c b/gtk/inspector/logs.c index 0faaab30df..ad084b36d2 100644 --- a/gtk/inspector/logs.c +++ b/gtk/inspector/logs.c @@ -62,10 +62,8 @@ struct _GtkInspectorLogs GtkWidget *renderer; GtkWidget *cairo; - GtkWidget *opengl_gsk; GtkWidget *vulkan_gsk; GtkWidget *shaders; - GtkWidget *surface; GtkWidget *glyphcache; GtkWidget *verbose; @@ -143,10 +141,8 @@ flag_toggled (GtkWidget *button, flags = gsk_get_debug_flags (); update_flag (logs->renderer, &flags, GSK_DEBUG_RENDERER); update_flag (logs->cairo, &flags, GSK_DEBUG_CAIRO); - update_flag (logs->opengl_gsk, &flags, GSK_DEBUG_OPENGL); update_flag (logs->vulkan_gsk, &flags, GSK_DEBUG_VULKAN); update_flag (logs->shaders, &flags, GSK_DEBUG_SHADERS); - update_flag (logs->surface, &flags, GSK_DEBUG_SURFACE); update_flag (logs->glyphcache, &flags, GSK_DEBUG_GLYPH_CACHE); update_flag (logs->verbose, &flags, GSK_DEBUG_VERBOSE); gsk_set_debug_flags (flags); @@ -207,10 +203,8 @@ gtk_inspector_logs_class_init (GtkInspectorLogsClass *klass) gtk_widget_class_bind_template_child (widget_class, GtkInspectorLogs, renderer); gtk_widget_class_bind_template_child (widget_class, GtkInspectorLogs, cairo); - gtk_widget_class_bind_template_child (widget_class, GtkInspectorLogs, opengl_gsk); gtk_widget_class_bind_template_child (widget_class, GtkInspectorLogs, vulkan_gsk); gtk_widget_class_bind_template_child (widget_class, GtkInspectorLogs, shaders); - gtk_widget_class_bind_template_child (widget_class, GtkInspectorLogs, surface); gtk_widget_class_bind_template_child (widget_class, GtkInspectorLogs, glyphcache); gtk_widget_class_bind_template_child (widget_class, GtkInspectorLogs, verbose); diff --git a/gtk/inspector/logs.ui b/gtk/inspector/logs.ui index 9b0c82b921..d6fd40fb95 100644 --- a/gtk/inspector/logs.ui +++ b/gtk/inspector/logs.ui @@ -128,12 +128,6 @@ - - - OpenGL - - - Vulkan @@ -146,12 +140,6 @@ - - - Surface - - - Glyph Cache