[gtk: 2/2] Merge branch 'wip/otte/shittymorph' into 'master'

[Benjamin Otte <otte src gnome org>]

commit 7a82e9f557dc8cf65ccb4875c8f501c4d8c43a3e
Merge: d7db3f1546 23acc993cc
Author: Benjamin Otte <otte benjamin googlemail com>
Date:   Fri Sep 24 08:50:17 2021 +0000

    Merge branch 'wip/otte/shittymorph' into 'master'
    
    gdk: Make sure only one GL backend is used
    
    See merge request GNOME/gtk!3992

 gdk/gdkdisplay.c                   |  2 ++
 gdk/gdkglcontext.c                 | 71 ++++++++++++++++++++++++++++++++++++--
 gdk/gdkglcontextprivate.h          | 14 ++++++++
 gdk/macos/gdkmacosdisplay.c        |  3 ++
 gdk/macos/gdkmacosglcontext.c      |  2 ++
 gdk/wayland/gdkglcontext-wayland.c |  5 +++
 gdk/win32/gdkglcontext-win32-egl.c |  5 +++
 gdk/win32/gdkglcontext-win32-wgl.c |  5 +++
 gdk/x11/gdkglcontext-egl.c         |  5 +++
 gdk/x11/gdkglcontext-glx.c         |  5 +++
 10 files changed, 115 insertions(+), 2 deletions(-)
---