AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Drop the gl-always debug option

Browse Source 
This doesn't seem very useful.
This commit is contained in:
Matthias Clasen 2018-01-12 19:49:27 -05:00
parent e151058dff
commit 08dc2cd6a8
5 changed files with 10 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gdk/gdk.c
View File

@ -150,7 +150,6 @@ static const GDebugKey gdk_debug_keys[] = {
{ "clipboard", GDK_DEBUG_CLIPBOARD }, { "clipboard", GDK_DEBUG_CLIPBOARD },
{ "nograbs", GDK_DEBUG_NOGRABS }, { "nograbs", GDK_DEBUG_NOGRABS },
{ "gl-disable", GDK_DEBUG_GL_DISABLE }, { "gl-disable", GDK_DEBUG_GL_DISABLE },
{ "gl-always", GDK_DEBUG_GL_ALWAYS },
{ "gl-software", GDK_DEBUG_GL_SOFTWARE }, { "gl-software", GDK_DEBUG_GL_SOFTWARE },
{ "gl-texture-rect", GDK_DEBUG_GL_TEXTURE_RECT }, { "gl-texture-rect", GDK_DEBUG_GL_TEXTURE_RECT },
{ "gl-legacy", GDK_DEBUG_GL_LEGACY }, { "gl-legacy", GDK_DEBUG_GL_LEGACY },

17
gdk/gdkinternals.h
View File

@ -71,15 +71,14 @@ typedef enum {
/* flags below are influencing behavior */ /* flags below are influencing behavior */
GDK_DEBUG_NOGRABS = 1 << 11, GDK_DEBUG_NOGRABS = 1 << 11,
GDK_DEBUG_GL_DISABLE = 1 << 12, GDK_DEBUG_GL_DISABLE = 1 << 12,
GDK_DEBUG_GL_ALWAYS = 1 << 13, GDK_DEBUG_GL_SOFTWARE = 1 << 13,
GDK_DEBUG_GL_SOFTWARE = 1 << 14, GDK_DEBUG_GL_TEXTURE_RECT = 1 << 14,
GDK_DEBUG_GL_TEXTURE_RECT = 1 << 15, GDK_DEBUG_GL_LEGACY = 1 << 15,
GDK_DEBUG_GL_LEGACY = 1 << 16, GDK_DEBUG_GL_GLES = 1 << 16,
GDK_DEBUG_GL_GLES = 1 << 17, GDK_DEBUG_VULKAN_DISABLE = 1 << 17,
GDK_DEBUG_VULKAN_DISABLE = 1 << 18, GDK_DEBUG_VULKAN_VALIDATE = 1 << 18,
GDK_DEBUG_VULKAN_VALIDATE = 1 << 19, GDK_DEBUG_CAIRO_IMAGE = 1 << 19,
GDK_DEBUG_CAIRO_IMAGE = 1 << 20, GDK_DEBUG_CAIRO_RECORDING = 1 << 20
GDK_DEBUG_CAIRO_RECORDING = 1 << 21
} GdkDebugFlags; } GdkDebugFlags;
extern GList *_gdk_default_filters; extern GList *_gdk_default_filters;

11
gdk/gdkwindow.c
View File

@ -998,17 +998,6 @@ gdk_window_new (GdkDisplay *display,
g_signal_connect (display, "seat-removed", G_CALLBACK (seat_removed_cb), window); g_signal_connect (display, "seat-removed", G_CALLBACK (seat_removed_cb), window);
if (GDK_DISPLAY_DEBUG_CHECK (display, GL_ALWAYS))
{
GError *error = NULL;
if (gdk_window_get_paint_gl_context (window, &error) == NULL)
{
g_warning ("Unable to force GL enabled: %s", error->message);
g_error_free (error);
}
}
return window; return window;
} }

6
gtk/inspector/visual.c
View File

@ -760,15 +760,13 @@ init_gl (GtkInspectorVisual *vis)
{ {
GdkDebugFlags flags = gdk_display_get_debug_flags (gdk_display_get_default ()); GdkDebugFlags flags = gdk_display_get_debug_flags (gdk_display_get_default ());
if (flags & GDK_DEBUG_GL_ALWAYS) if (flags & GDK_DEBUG_GL_DISABLE)
gtk_combo_box_set_active_id (GTK_COMBO_BOX (vis->priv->gl_combo), "always");
else if (flags & GDK_DEBUG_GL_DISABLE)
gtk_combo_box_set_active_id (GTK_COMBO_BOX (vis->priv->gl_combo), "disable"); gtk_combo_box_set_active_id (GTK_COMBO_BOX (vis->priv->gl_combo), "disable");
else else
gtk_combo_box_set_active_id (GTK_COMBO_BOX (vis->priv->gl_combo), "maybe"); gtk_combo_box_set_active_id (GTK_COMBO_BOX (vis->priv->gl_combo), "maybe");
gtk_widget_set_sensitive (vis->priv->gl_combo, FALSE); gtk_widget_set_sensitive (vis->priv->gl_combo, FALSE);
gtk_widget_set_tooltip_text (vis->priv->gl_combo, gtk_widget_set_tooltip_text (vis->priv->gl_combo,
_("Not settable at runtime.\nUse GDK_DEBUG=gl-always or GDK_DEBUG=gl-disable instead")); _("Not settable at runtime.\nUse GDK_DEBUG=gl-disable instead"));
gtk_switch_set_active (GTK_SWITCH (vis->priv->software_gl_switch), flags & GDK_DEBUG_GL_SOFTWARE); gtk_switch_set_active (GTK_SWITCH (vis->priv->software_gl_switch), flags & GDK_DEBUG_GL_SOFTWARE);
gtk_switch_set_active (GTK_SWITCH (vis->priv->texture_rectangle_switch), flags & GDK_DEBUG_GL_TEXTURE_RECT); gtk_switch_set_active (GTK_SWITCH (vis->priv->texture_rectangle_switch), flags & GDK_DEBUG_GL_TEXTURE_RECT);

1
gtk/inspector/visual.ui
View File

@ -672,7 +672,6 @@
<property name="hexpand">1</property> <property name="hexpand">1</property>
<items> <items>
<item translatable="yes" id="maybe">When Needed</item> <item translatable="yes" id="maybe">When Needed</item>
<item translatable="yes" id="always">Always</item>
<item translatable="yes" id="disable">Disabled</item> <item translatable="yes" id="disable">Disabled</item>
</items> </items>
</object> </object>