[gtk/debug-envvars-cleanup: 7/16] Make the gl-disable flag always available
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/debug-envvars-cleanup: 7/16] Make the gl-disable flag always available
- Date: Thu, 22 Sep 2022 02:01:54 +0000 (UTC)
commit fa0fc9acb864ebf68ff7096b163cd3add37f8860
Author: Matthias Clasen <mclasen redhat com>
Date: Wed Sep 21 20:57:22 2022 -0400
Make the gl-disable flag always available
No need to restrict this to debug builds.
gdk/gdk.c | 2 +-
gdk/gdkdisplay.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/gdk/gdk.c b/gdk/gdk.c
index 90f3c9ecd5..46d02841cc 100644
--- a/gdk/gdk.c
+++ b/gdk/gdk.c
@@ -118,7 +118,7 @@ static const GdkDebugKey gdk_debug_keys[] = {
{ "clipboard", GDK_DEBUG_CLIPBOARD, "Information about clipboards" },
{ "nograbs", GDK_DEBUG_NOGRABS, "Disable pointer and keyboard grabs (X11)", TRUE },
{ "portals", GDK_DEBUG_PORTALS, "Force the use of portals", TRUE },
- { "gl-disable", GDK_DEBUG_GL_DISABLE, "Disable OpenGL support" },
+ { "gl-disable", GDK_DEBUG_GL_DISABLE, "Disable OpenGL support", TRUE },
{ "gl-software", GDK_DEBUG_GL_SOFTWARE, "Force OpenGL software rendering" },
{ "gl-texture-rect", GDK_DEBUG_GL_TEXTURE_RECT, "Use OpenGL texture rectangle extension" },
{ "gl-legacy", GDK_DEBUG_GL_LEGACY, "Use a legacy OpenGL context" },
diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c
index be5e2f5ff1..1f4a6ab0ae 100644
--- a/gdk/gdkdisplay.c
+++ b/gdk/gdkdisplay.c
@@ -1233,7 +1233,7 @@ gdk_display_init_gl (GdkDisplay *self)
before = GDK_PROFILER_CURRENT_TIME;
- if (GDK_DISPLAY_DEBUG_CHECK (self, GL_DISABLE))
+ if (gdk_display_get_debug_flags (self) & GDK_DEBUG_GL_DISABLE)
{
g_set_error_literal (&priv->gl_error, GDK_GL_ERROR,
GDK_GL_ERROR_NOT_AVAILABLE,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]