[gtk: 2/2] Merge branch 'wip/chergert/ngl-fix-windows-intel-driver' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit 272d8a680000e8fbb9556dd7ae5131ed6b1c9ec5
Merge: 1f6b556972 f8a6a09896
Author: Matthias Clasen <mclasen redhat com>
Date:   Tue Mar 23 21:02:11 2021 +0000

    Merge branch 'wip/chergert/ngl-fix-windows-intel-driver' into 'master'
    
    ngl: move uniform key mapping into uniform state
    
    Closes #3780
    
    See merge request GNOME/gtk!3340

 gsk/ngl/gsknglcommandqueue.c        |  17 ++-
 gsk/ngl/gsknglcommandqueueprivate.h |   2 +-
 gsk/ngl/gskngldriver.c              |  40 +++---
 gsk/ngl/gskngldriverprivate.h       |   8 ++
 gsk/ngl/gsknglprogram.c             |  28 ++--
 gsk/ngl/gsknglprogramprivate.h      |  97 +++++++-------
 gsk/ngl/gsknglrenderjob.c           |  79 +++++-------
 gsk/ngl/gskngluniformstate.c        | 105 +++++++--------
 gsk/ngl/gskngluniformstateprivate.h | 250 ++++++++++++++++--------------------
 9 files changed, 289 insertions(+), 337 deletions(-)
---