[gtk: 7/7] Merge branch 'gles-texture-colors' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit c9f6a9f7c523bf6b59aa7fb4cc07092bbaf35378
Merge: 09564a5798 a299bbfc58
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Sep 25 14:53:19 2020 +0000

    Merge branch 'gles-texture-colors' into 'master'
    
    Fix uploads of textures in GLES (and make texture uploads better)
    
    See merge request GNOME/gtk!2616

 docs/reference/gdk/gdk4-sections.txt |   1 -
 gdk/gdkcairo.h                       |   7 ---
 gdk/gdkgl.c                          |  48 ----------------
 gdk/gdkglcontext.c                   |  92 ++++++++++++++++++++++--------
 gdk/gdkglcontextprivate.h            |   2 +
 gdk/gdkmemorytexture.c               |  31 ++++++----
 gdk/gdkmemorytexture.h               |   3 +
 gdk/gdkmemorytextureprivate.h        |   2 +
 gdk/gdktexture.c                     |  41 ++++++--------
 gdk/gdktextureprivate.h              |   1 -
 gsk/gl/gskgldriver.c                 | 107 +++++++++++++++++++++++------------
 gsk/gl/gskgldriverprivate.h          |   4 +-
 gsk/gl/gskglglyphcache.c             |  29 ++++++++--
 gsk/gl/gskgliconcache.c              |  58 ++++++++++++-------
 gsk/gl/gskglrenderer.c               |  13 +++--
 testsuite/gdk/memorytexture.c        |   1 +
 16 files changed, 255 insertions(+), 185 deletions(-)
---