[gtk/debug-envvars-cleanup: 11/16] Make the gl-gles debug flag always available
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/debug-envvars-cleanup: 11/16] Make the gl-gles debug flag always available
- Date: Thu, 22 Sep 2022 02:01:55 +0000 (UTC)
commit 01054c9c79bc11eb10fdb1b14e47fb798ca3ce68
Author: Matthias Clasen <mclasen redhat com>
Date: Wed Sep 21 21:12:22 2022 -0400
Make the gl-gles debug flag always available
No need to restrict this to debug builds.
gdk/gdk.c | 2 +-
gdk/gdkglcontext.c | 2 +-
gdk/win32/gdkdisplay-win32.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/gdk/gdk.c b/gdk/gdk.c
index 637f76fb6a..cc2a81f1d4 100644
--- a/gdk/gdk.c
+++ b/gdk/gdk.c
@@ -120,7 +120,7 @@ static const GdkDebugKey gdk_debug_keys[] = {
{ "portals", GDK_DEBUG_PORTALS, "Force the use of portals", TRUE },
{ "gl-disable", GDK_DEBUG_GL_DISABLE, "Disable OpenGL support", TRUE },
{ "gl-legacy", GDK_DEBUG_GL_LEGACY, "Use a legacy OpenGL context", TRUE },
- { "gl-gles", GDK_DEBUG_GL_GLES, "Only allow OpenGL GLES API" },
+ { "gl-gles", GDK_DEBUG_GL_GLES, "Only allow OpenGL GLES API", TRUE },
{ "gl-debug", GDK_DEBUG_GL_DEBUG, "Insert debugging information in OpenGL" },
{ "gl-egl", GDK_DEBUG_GL_EGL, "Use EGL on X11 or Windows" },
{ "gl-glx", GDK_DEBUG_GL_GLX, "Use GLX on X11" },
diff --git a/gdk/gdkglcontext.c b/gdk/gdkglcontext.c
index 001addb622..0452640244 100644
--- a/gdk/gdkglcontext.c
+++ b/gdk/gdkglcontext.c
@@ -1265,7 +1265,7 @@ gdk_gl_context_is_api_allowed (GdkGLContext *self,
{
GdkGLContextPrivate *priv = gdk_gl_context_get_instance_private (self);
- if (GDK_DISPLAY_DEBUG_CHECK (gdk_gl_context_get_display (self), GL_GLES))
+ if (gdk_display_get_debug_flags (gdk_gl_context_get_display (self)) & GDK_DEBUG_GL_GLES)
{
if (!(api & GDK_GL_API_GLES))
{
diff --git a/gdk/win32/gdkdisplay-win32.c b/gdk/win32/gdkdisplay-win32.c
index fa4cfcd2d4..5c53f247c2 100644
--- a/gdk/win32/gdkdisplay-win32.c
+++ b/gdk/win32/gdkdisplay-win32.c
@@ -1197,7 +1197,7 @@ gdk_win32_display_init_gl (GdkDisplay *display,
* Disable defaulting to EGL as EGL is used more as a compatibility layer
* on Windows rather than being a native citizen on Windows
*/
- if (GDK_DEBUG_CHECK (GL_EGL) || GDK_DEBUG_CHECK (GL_GLES))
+ if (gdk_display_get_debug_flags (display) & (GDK_DEBUG_GL_EGL|GDK_DEBUG_GL_GLES))
{
if (gdk_display_init_egl (display,
EGL_PLATFORM_ANGLE_ANGLE,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]