[gtk: 6/6] Merge branch 'ngl-vertex-attributes' into 'master'




commit 3e1524fade9dad0f969dc88f8a08450857ba23ab
Merge: 7f292d34bd ebe30d851b
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Mar 12 21:26:52 2021 +0000

    Merge branch 'ngl-vertex-attributes' into 'master'
    
    Ngl vertex attributes
    
    See merge request GNOME/gtk!3290

 demos/gtk-demo/iconscroll.c                    |  48 +++-
 gsk/gen-gsk-gresources-xml.py                  |  15 +-
 gsk/meson.build                                |  23 ++
 gsk/ngl/gsknglcommandqueue.c                   |   6 +
 gsk/ngl/gskngldriver.c                         |   9 +-
 gsk/ngl/gskngldriverprivate.h                  |   8 +-
 gsk/ngl/gsknglprograms.defs                    |  38 ++-
 gsk/ngl/gsknglrenderjob.c                      | 359 +++++++++++--------------
 gsk/ngl/gskngltypesprivate.h                   |   1 +
 gsk/ngl/resources/blend.glsl                   | 314 +++++++++++++++++++++
 gsk/ngl/resources/blit.glsl                    |  17 ++
 gsk/ngl/resources/blur.glsl                    |  59 ++++
 gsk/ngl/resources/border.glsl                  |  43 +++
 gsk/ngl/resources/color.glsl                   |  20 ++
 gsk/ngl/resources/color_matrix.glsl            |  29 ++
 gsk/ngl/resources/coloring.glsl                |  36 +++
 gsk/ngl/resources/conic_gradient.glsl          |  76 ++++++
 gsk/ngl/resources/cross_fade.glsl              |  24 ++
 gsk/ngl/resources/custom.glsl                  |  25 ++
 gsk/ngl/resources/inset_shadow.glsl            |  44 +++
 gsk/ngl/resources/linear_gradient.glsl         |  98 +++++++
 gsk/ngl/resources/outset_shadow.glsl           |  36 +++
 gsk/ngl/resources/preamble.fs.glsl             | 138 ++++++++++
 gsk/ngl/resources/preamble.glsl                |  57 ++++
 gsk/ngl/resources/preamble.vs.glsl             |  71 +++++
 gsk/ngl/resources/radial_gradient.glsl         |  78 ++++++
 gsk/ngl/resources/repeat.glsl                  |  44 +++
 gsk/ngl/resources/unblurred_outset_shadow.glsl |  44 +++
 28 files changed, 1520 insertions(+), 240 deletions(-)
---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]