[gtk: 54/54] Merge branch 'wip/otte/gleanup' into 'master'

[Benjamin Otte <otte src gnome org>]

commit 02c62267413c2c187a77f7f91610690f8b0a5d0a
Merge: a5555943ed 620ccdabb5
Author: Benjamin Otte <otte benjamin googlemail com>
Date:   Thu Jul 22 14:51:05 2021 +0000

    Merge branch 'wip/otte/gleanup' into 'master'
    
    reorganize GDK's GL code
    
    See merge request GNOME/gtk!3726

 gdk/gdk.c                             |    2 +
 gdk/gdkdebug.h                        |   10 +-
 gdk/gdkdisplay.c                      |  198 +++++-
 gdk/gdkdisplay.h                      |    4 +
 gdk/gdkdisplayprivate.h               |   12 +-
 gdk/gdkdrawcontext.c                  |   32 +-
 gdk/gdkglcontext.c                    |  179 +++--
 gdk/gdkglcontext.h                    |    7 +-
 gdk/gdkglcontextprivate.h             |   21 +-
 gdk/gdksurface.c                      |   90 +--
 gdk/gdksurfaceprivate.h               |    5 -
 gdk/macos/gdkmacosdisplay.c           |   18 +-
 gdk/macos/gdkmacosglcontext-private.h |    9 +-
 gdk/macos/gdkmacosglcontext.c         |  118 ++--
 gdk/macos/gdkmacossurface.c           |   15 -
 gdk/wayland/gdkdisplay-wayland.c      |    2 +-
 gdk/wayland/gdkdisplay-wayland.h      |    4 +-
 gdk/wayland/gdkglcontext-wayland.c    |  301 ++++----
 gdk/wayland/gdkglcontext-wayland.h    |    9 +-
 gdk/wayland/gdkprivate-wayland.h      |    5 -
 gdk/wayland/gdksurface-wayland.c      |   43 +-
 gdk/wayland/gdksurface-wayland.h      |    5 +
 gdk/win32/gdkdisplay-win32.c          |   89 ++-
 gdk/win32/gdkdisplay-win32.h          |   11 +-
 gdk/win32/gdkglcontext-win32-egl.c    |  504 ++++++++++++++
 gdk/win32/gdkglcontext-win32-wgl.c    |  727 ++++++++++++++++++++
 gdk/win32/gdkglcontext-win32.c        | 1211 +--------------------------------
 gdk/win32/gdkglcontext-win32.h        |   53 +-
 gdk/win32/gdksurface-win32.c          |   25 +-
 gdk/win32/gdksurface-win32.h          |    6 +-
 gdk/win32/meson.build                 |    2 +
 gdk/x11/gdkdisplay-x11.c              |  209 +++---
 gdk/x11/gdkdisplay-x11.h              |   16 +-
 gdk/x11/gdkglcontext-egl.c            |  748 ++++++++++----------
 gdk/x11/gdkglcontext-glx.c            |  780 ++++++---------------
 gdk/x11/gdkglcontext-x11.c            |   74 --
 gdk/x11/gdkglcontext-x11.h            |   44 +-
 gdk/x11/gdkprivate-x11.h              |    5 -
 gdk/x11/gdkscreen-x11.c               |   14 +-
 gdk/x11/gdkscreen-x11.h               |   17 +-
 gdk/x11/gdksurface-x11.c              |   26 +-
 gdk/x11/gdksurface-x11.h              |    3 +
 gdk/x11/gdkvisual-x11.c               |  322 ---------
 gdk/x11/gdkvisual-x11.h               |   83 ---
 gdk/x11/meson.build                   |    1 -
 gsk/gl/gskgldriver.c                  |    9 +-
 gsk/ngl/gskngldriver.c                |   34 +-
 gsk/ngl/gskngldriverprivate.h         |    2 +-
 gsk/ngl/gsknglrenderer.c              |   14 +-
 gtk/inspector/general.c               |   17 +
 gtk/inspector/general.ui              |   25 +-
 meson.build                           |    2 +-
 52 files changed, 2794 insertions(+), 3368 deletions(-)
---