diff options
| author | Benjamin Otte <otte.benjamin@googlemail.com> | 2022-04-08 22:00:33 +0000 |
|---|---|---|
| committer | Benjamin Otte <otte.benjamin@googlemail.com> | 2022-04-08 22:00:33 +0000 |
| commit | 7d1429cb91c4a6b6eb851af5dce9c27334045e8c (patch) | |
| tree | fb06dccb5524c62177f70b5e2b5417b97ab1207e | |
| parent | f13a018739f1522c9352bdbfe3813d4d9ff3facf (diff) | |
| parent | 89d87e34827ff6d954cbc45b8e9e42b4ec17a987 (diff) | |
| download | gtk+-7d1429cb91c4a6b6eb851af5dce9c27334045e8c.tar.gz | |
Merge branch 'gles-win32' into 'main'
Inspector: Fix running on Windows with GLES (was: fix running GL demos with GLES on Windows)
See merge request GNOME/gtk!4595
| -rw-r--r-- | gtk/inspector/general.c | 7 |
1 files 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 <epoxy/wgl.h> -#endif - #ifdef GDK_WIN32_ENABLE_EGL #include <epoxy/egl.h> #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; |