[gtk: 25/25] Merge branch 'wip/otte/gl-hdr' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit 0969d9db837ab84fd93894fb49bf491701e1a938
Merge: 9e88275de6 cdc85232b2
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed Oct 6 02:59:05 2021 +0000

    Merge branch 'wip/otte/gl-hdr' into 'master'
    
    Rework GL for HDR support
    
    See merge request GNOME/gtk!4032

 demos/widget-factory/widget-factory.ui      |   6 +-
 gdk/broadway/gdkcairocontext-broadway.c     |   1 +
 gdk/broadway/gdkdrawcontext-broadway.c      |   1 +
 gdk/gdk-private.h                           |   4 -
 gdk/gdk.c                                   |  10 +
 gdk/gdkdebug.h                              |   1 +
 gdk/gdkdisplay.c                            | 444 +++++++++++++++++
 gdk/gdkdisplayprivate.h                     |  26 +-
 gdk/gdkdrawcontext.c                        |  38 +-
 gdk/gdkdrawcontextprivate.h                 |   4 +
 gdk/gdkgl.c                                 | 267 +----------
 gdk/gdkglcontext.c                          | 401 +++++++++++++---
 gdk/gdkglcontextprivate.h                   |  14 -
 gdk/gdksurface.c                            | 114 ++++-
 gdk/gdksurfaceprivate.h                     |  16 +-
 gdk/gdkvulkancontext.c                      |   1 +
 gdk/gen-gdk-gresources-xml.py               |   3 -
 gdk/macos/gdkmacoscairocontext.c            |   1 +
 gdk/macos/gdkmacosglcontext.c               |   3 +-
 gdk/resources/glsl/gl2-texture-2d.fs.glsl   |   9 -
 gdk/resources/glsl/gl2-texture-2d.vs.glsl   |  11 -
 gdk/resources/glsl/gl2-texture-rect.fs.glsl |   9 -
 gdk/resources/glsl/gl2-texture-rect.vs.glsl |  11 -
 gdk/resources/glsl/gl3-texture-2d.fs.glsl   |  11 -
 gdk/resources/glsl/gl3-texture-2d.vs.glsl   |  11 -
 gdk/resources/glsl/gl3-texture-rect.fs.glsl |   9 -
 gdk/resources/glsl/gl3-texture-rect.vs.glsl |  11 -
 gdk/resources/glsl/gles2-texture.fs.glsl    |  16 -
 gdk/resources/glsl/gles2-texture.vs.glsl    |  10 -
 gdk/wayland/gdkcairocontext-wayland.c       |   1 +
 gdk/wayland/gdkdisplay-wayland.h            |   9 -
 gdk/wayland/gdkglcontext-wayland.c          | 600 +----------------------
 gdk/wayland/gdkglcontext-wayland.h          |   2 -
 gdk/wayland/gdksurface-wayland.c            |  40 +-
 gdk/wayland/gdksurface-wayland.h            |   5 +-
 gdk/win32/gdkcairocontext-win32.c           |   1 +
 gdk/win32/gdkdisplay-win32.c                |   7 -
 gdk/win32/gdkdrop-win32.c                   |   4 +-
 gdk/win32/gdkglcontext-win32-egl.c          |   8 +-
 gdk/win32/gdkglcontext-win32-wgl.c          |   3 +-
 gdk/win32/gdksurface-win32.c                |   8 -
 gdk/win32/gdkvulkancontext-win32.c          |   3 +-
 gdk/win32/meson.build                       |   2 +-
 gdk/x11/gdkcairocontext-x11.c               |   1 +
 gdk/x11/gdkdisplay-x11.c                    | 111 ++++-
 gdk/x11/gdkdisplay-x11.h                    |   8 -
 gdk/x11/gdkglcontext-egl.c                  | 720 +---------------------------
 gdk/x11/gdkglcontext-x11.c                  |   1 -
 gdk/x11/gdkglcontext-x11.h                  |   7 -
 gdk/x11/gdksurface-x11.c                    |   4 +-
 gdk/x11/gdksurface-x11.h                    |   1 -
 gtk/gtkdragicon.c                           |   3 +-
 gtk/gtkmarshalers.list                      |   2 +-
 gtk/gtknative.c                             |   4 +-
 gtk/gtkpathbar.c                            |   2 +-
 gtk/gtktexthandle.c                         |  21 +-
 gtk/gtktooltipwindow.c                      |   8 +-
 meson.build                                 |  12 +-
 58 files changed, 1143 insertions(+), 1918 deletions(-)
---