From: Chun-wei Fan Date: Wed, 30 Mar 2022 02:23:49 +0000 (+0800) Subject: inspector/general.c: Check whether GL context supports WGL X-Git-Tag: archive/raspbian/4.8.3+ds-2+rpi1~3^2~20^2~4^2~255^2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=89d87e34827ff6d954cbc45b8e9e42b4ec17a987;p=gtk4.git 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. --- 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;