From 177302cf4dcdfe2d6c7a03057e5206c8175f0798 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Wed, 30 Mar 2022 10:23:49 +0800 Subject: [PATCH] inspector/general.c: Check whether GL context supports WGL We may well be using an EGL context that does not support Desktop (W)GL on Windows, such as in the case of using libANGLE. So, check whether WGL is supported for this running instance before trying to query WGL extensions. This will get rid of warning messages from libepoxy. --- gtk/inspector/general.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gtk/inspector/general.c b/gtk/inspector/general.c index ad52422fa3..f456ea0da4 100644 --- a/gtk/inspector/general.c +++ b/gtk/inspector/general.c @@ -45,12 +45,12 @@ #ifdef GDK_WINDOWING_WIN32 #include "win32/gdkwin32.h" +#include "gdkglcontextprivate.h" #include -#endif - #ifdef GDK_WIN32_ENABLE_EGL #include #endif +#endif #ifdef GDK_WINDOWING_MACOS #include "macos/gdkmacos.h" @@ -387,7 +387,8 @@ init_gl (GtkInspectorGeneral *gen) else #endif #ifdef GDK_WINDOWING_WIN32 - if (GDK_IS_WIN32_DISPLAY (gen->display)) + if (GDK_IS_WIN32_DISPLAY (gen->display) && + gdk_gl_backend_can_be_used (GDK_GL_WGL, NULL)) { int gl_version; char *version; -- 2.30.2