[gtk: 5/5] Merge branch 'ngl-is-the-new-gl' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit 49a64da7ec596631b1c1a52f87b9f310fffc5613
Merge: 922e6add38 b7eb1d3310
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon Oct 11 06:43:41 2021 +0000

    Merge branch 'ngl-is-the-new-gl' into 'master'
    
    Rename ngl to gl
    
    Closes #4318
    
    See merge request GNOME/gtk!4037

 demos/node-editor/node-editor-window.c             |    4 +-
 gdk/gdkmemoryformat.c                              |    2 +-
 gdk/gdkmemorytexture.c                             |    2 +-
 gdk/loaders/gdkpng.c                               |    2 +-
 gsk/{ngl => gl}/fp16.c                             |    0
 gsk/{ngl => gl}/fp16i.c                            |    0
 gsk/{ngl => gl}/fp16private.h                      |    0
 .../gskglattachmentstate.c}                        |   32 +-
 .../gskglattachmentstateprivate.h}                 |   48 +-
 gsk/{ngl/gsknglbuffer.c => gl/gskglbuffer.c}       |   18 +-
 .../gskglbufferprivate.h}                          |   34 +-
 .../gskglcommandqueue.c}                           |  480 ++--
 gsk/gl/gskglcommandqueueprivate.h                  |  362 +++
 gsk/{ngl/gsknglcompiler.c => gl/gskglcompiler.c}   |  180 +-
 gsk/gl/gskglcompilerprivate.h                      |   70 +
 gsk/{ngl/gskngldriver.c => gl/gskgldriver.c}       |  728 +++---
 gsk/gl/gskgldriverprivate.h                        |  251 +++
 .../gskglglyphlibrary.c}                           |  164 +-
 gsk/gl/gskglglyphlibraryprivate.h                  |  103 +
 .../gskngliconlibrary.c => gl/gskgliconlibrary.c}  |   62 +-
 gsk/gl/gskgliconlibraryprivate.h                   |   60 +
 gsk/{ngl => gl}/gskglprofiler.c                    |    0
 gsk/{ngl => gl}/gskglprofilerprivate.h             |    0
 gsk/{ngl/gsknglprogram.c => gl/gskglprogram.c}     |   74 +-
 gsk/gl/gskglprogramprivate.h                       |  282 +++
 gsk/gl/gskglprograms.defs                          |   84 +
 gsk/{ngl/gsknglrenderer.c => gl/gskglrenderer.c}   |  207 +-
 gsk/gl/gskglrenderer.h                             |   50 +
 .../gskglrendererprivate.h}                        |   16 +-
 gsk/{ngl/gsknglrenderjob.c => gl/gskglrenderjob.c} | 2318 ++++++++++----------
 gsk/gl/gskglrenderjobprivate.h                     |   39 +
 .../gskglshadowlibrary.c}                          |   88 +-
 gsk/gl/gskglshadowlibraryprivate.h                 |   44 +
 gsk/{ngl/gskngltexture.c => gl/gskgltexture.c}     |   40 +-
 .../gskgltexturelibrary.c}                         |  184 +-
 gsk/gl/gskgltexturelibraryprivate.h                |  208 ++
 .../gskgltextureprivate.h}                         |   44 +-
 gsk/gl/gskgltypesprivate.h                         |   66 +
 .../gskgluniformstate.c}                           |   78 +-
 gsk/gl/gskgluniformstateprivate.h                  |  836 +++++++
 gsk/{ngl => gl}/inlinearray.h                      |    0
 gsk/{ngl => gl}/ninesliceprivate.h                 |   22 +-
 gsk/{ngl => gl}/resources/blend.glsl               |    0
 gsk/{ngl => gl}/resources/blit.glsl                |    0
 gsk/{ngl => gl}/resources/blur.glsl                |    0
 gsk/{ngl => gl}/resources/border.glsl              |    0
 gsk/{ngl => gl}/resources/color.glsl               |    0
 gsk/{ngl => gl}/resources/color_matrix.glsl        |    0
 gsk/{ngl => gl}/resources/coloring.glsl            |    0
 gsk/{ngl => gl}/resources/conic_gradient.glsl      |    0
 gsk/{ngl => gl}/resources/cross_fade.glsl          |    0
 gsk/{ngl => gl}/resources/custom.glsl              |    0
 gsk/{ngl => gl}/resources/filled_border.glsl       |    0
 gsk/{ngl => gl}/resources/inset_shadow.glsl        |    0
 gsk/{ngl => gl}/resources/linear_gradient.glsl     |    0
 gsk/{ngl => gl}/resources/outset_shadow.glsl       |    0
 gsk/{ngl => gl}/resources/preamble.fs.glsl         |    0
 gsk/{ngl => gl}/resources/preamble.glsl            |    0
 gsk/{ngl => gl}/resources/preamble.vs.glsl         |    0
 gsk/{ngl => gl}/resources/radial_gradient.glsl     |    0
 gsk/{ngl => gl}/resources/repeat.glsl              |    0
 .../resources/unblurred_outset_shadow.glsl         |    0
 gsk/{ngl => gl}/stb_rect_pack.c                    |    0
 gsk/{ngl => gl}/stb_rect_pack.h                    |    0
 gsk/gskglshader.c                                  |    6 +-
 gsk/gskrenderer.c                                  |   18 +-
 gsk/meson.build                                    |   82 +-
 gsk/ngl/gsknglcommandqueueprivate.h                |  362 ---
 gsk/ngl/gsknglcompilerprivate.h                    |   70 -
 gsk/ngl/gskngldriverprivate.h                      |  251 ---
 gsk/ngl/gsknglglyphlibraryprivate.h                |  103 -
 gsk/ngl/gskngliconlibraryprivate.h                 |   60 -
 gsk/ngl/gsknglprogramprivate.h                     |  282 ---
 gsk/ngl/gsknglprograms.defs                        |   84 -
 gsk/ngl/gsknglrenderer.h                           |   46 -
 gsk/ngl/gsknglrenderjobprivate.h                   |   39 -
 gsk/ngl/gsknglshadowlibraryprivate.h               |   44 -
 gsk/ngl/gskngltexturelibraryprivate.h              |  208 --
 gsk/ngl/gskngltypesprivate.h                       |   66 -
 gsk/ngl/gskngluniformstateprivate.h                |  836 -------
 gtk/gentypefuncs.py                                |    2 +
 gtk/gtktestutils.c                                 |    2 +-
 gtk/inspector/general.c                            |    2 -
 testsuite/gdk/memorytexture.c                      |    4 +-
 testsuite/gdk/texture-threads.c                    |    4 +-
 testsuite/gsk/half-float.c                         |    2 +-
 testsuite/gsk/meson.build                          |    2 +-
 87 files changed, 4955 insertions(+), 4902 deletions(-)
---