diff --git a/docs/reference/gtk/running.md b/docs/reference/gtk/running.md
index 564ffdaef7..f0193a3447 100644
--- a/docs/reference/gtk/running.md
+++ b/docs/reference/gtk/running.md
@@ -278,14 +278,11 @@ are only available when GTK has been configured with `-Ddebug=true`.
: OpenGL renderer information
`vulkan`
-: Vulkan renderer information
+: Check Vulkan errors
`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/gl/gskglcommandqueue.c b/gsk/gl/gskglcommandqueue.c
index cfafffa382..40da43b650 100644
--- a/gsk/gl/gskglcommandqueue.c
+++ b/gsk/gl/gskglcommandqueue.c
@@ -488,12 +488,14 @@ gsk_gl_command_queue_new (GdkGLContext *context,
int max_texture_size = atoi (g_getenv ("GSK_MAX_TEXTURE_SIZE"));
if (max_texture_size == 0)
{
- g_warning ("Failed to parse GSK_MAX_TEXTURE_SIZE");
+ g_warning ("Failed to parse %s", "GSK_MAX_TEXTURE_SIZE");
}
else
{
max_texture_size = MAX (max_texture_size, 512);
- GSK_DEBUG(OPENGL, "Limiting max texture size to %d", max_texture_size);
+ GSK_DEBUG (RENDERER,
+ "Limiting texture size in the GL renderer to %d (via %s)",
+ max_texture_size, "GSK_MAX_TEXTURE_SIZE");
self->max_texture_size = MIN (self->max_texture_size, max_texture_size);
}
}
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 @@
-
-
-
-
-
-