[gtk: 11/11] Merge branch 'ngl-less-shaders' into 'master'




commit 24ec2cc6a67bba6b2898c9a55d554dae76c5bc76
Merge: 3408240ba6 28de2eecc9
Author: Matthias Clasen <mclasen redhat com>
Date:   Sun Mar 14 21:04:37 2021 +0000

    Merge branch 'ngl-less-shaders' into 'master'
    
    Assorted ngl improvements
    
    See merge request GNOME/gtk!3295

 gsk/meson.build                                |   1 +
 gsk/ngl/gsknglcommandqueue.c                   |   6 +
 gsk/ngl/gskngldriver.c                         |   2 +
 gsk/ngl/gsknglprograms.defs                    |  23 +-
 gsk/ngl/gsknglrenderjob.c                      | 751 ++++++++++++-------------
 gsk/ngl/gskngltypesprivate.h                   |   1 +
 gsk/ngl/resources/blend.glsl                   |   2 +-
 gsk/ngl/resources/blit.glsl                    |   2 +-
 gsk/ngl/resources/border.glsl                  |   4 +-
 gsk/ngl/resources/color.glsl                   |   2 +-
 gsk/ngl/resources/color_matrix.glsl            |   4 +-
 gsk/ngl/resources/coloring.glsl                |   9 +-
 gsk/ngl/resources/conic_gradient.glsl          |  28 +-
 gsk/ngl/resources/filled_border.glsl           |  47 ++
 gsk/ngl/resources/inset_shadow.glsl            |   4 +-
 gsk/ngl/resources/linear_gradient.glsl         |  28 +-
 gsk/ngl/resources/outset_shadow.glsl           |   6 +-
 gsk/ngl/resources/preamble.fs.glsl             |  28 +-
 gsk/ngl/resources/preamble.vs.glsl             |   2 +
 gsk/ngl/resources/radial_gradient.glsl         |  28 +-
 gsk/ngl/resources/repeat.glsl                  |   2 +-
 gsk/ngl/resources/unblurred_outset_shadow.glsl |   2 +-
 22 files changed, 523 insertions(+), 459 deletions(-)
---


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