[gtk: 4/4] Merge branch 'wip/otte/conic' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit 0daa905a2709512160215d261c3165aec19b6447
Merge: d1a4ad3db6 2c1bd399d2
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu Dec 3 17:14:01 2020 +0000

    Merge branch 'wip/otte/conic' into 'master'
    
    Implement a GL shader for conic gradients
    
    See merge request GNOME/gtk!2913

 gsk/gl/gskglrenderer.c                 | 69 ++++++++++++++++++++++++++++++++--
 gsk/gl/gskglrenderops.c                | 24 ++++++++++++
 gsk/gl/gskglrenderopsprivate.h         | 15 +++++++-
 gsk/gl/opbuffer.c                      |  1 +
 gsk/gl/opbuffer.h                      |  9 +++++
 gsk/gskrendernodeimpl.c                |  4 +-
 gsk/meson.build                        |  1 +
 gsk/resources/glsl/conic_gradient.glsl | 69 ++++++++++++++++++++++++++++++++++
 8 files changed, 185 insertions(+), 7 deletions(-)
---