[gtk: 15/15] Merge branch 'glshader-node' into 'master'




commit 2e5caa68bc5b37fdf1b808b304c6d5499f21ab48
Merge: e29c586b7c 4e55220d76
Author: Alexander Larsson <alexl redhat com>
Date:   Tue Sep 29 08:30:48 2020 +0000

    Merge branch 'glshader-node' into 'master'
    
    Add support for GLShader nodes
    
    See merge request GNOME/gtk!2594

 demos/gtk-demo/cogs2.glsl                       |  226 ++++
 demos/gtk-demo/demo.gresource.xml               |   13 +
 demos/gtk-demo/fire.glsl                        |   72 ++
 demos/gtk-demo/fishbowl.c                       |   34 +
 demos/gtk-demo/gltransition.c                   |  329 ++++++
 demos/gtk-demo/gskshaderpaintable.c             |  337 ++++++
 demos/gtk-demo/gskshaderpaintable.h             |   53 +
 demos/gtk-demo/gtkshaderbin.c                   |  241 ++++
 demos/gtk-demo/gtkshaderbin.h                   |   22 +
 demos/gtk-demo/gtkshaderstack.c                 |  352 ++++++
 demos/gtk-demo/gtkshaderstack.h                 |   21 +
 demos/gtk-demo/gtkshadertoy.c                   |    6 +-
 demos/gtk-demo/meson.build                      |    4 +
 demos/gtk-demo/transition1.glsl                 |   33 +
 demos/gtk-demo/transition2.glsl                 |   34 +
 demos/gtk-demo/transition3.glsl                 |   27 +
 demos/gtk-demo/transition4.glsl                 |   41 +
 docs/reference/gsk/gsk4-docs.xml                |    1 +
 docs/reference/gsk/gsk4-sections.txt            |   51 +
 docs/reference/gsk/gsk4.types                   |    1 +
 docs/reference/gtk/gtk4-sections.txt            |    1 +
 gsk/broadway/gskbroadwayrenderer.c              |    2 +
 gsk/gl/gskglrenderer.c                          |  382 ++++++-
 gsk/gl/gskglrendererprivate.h                   |   14 +
 gsk/gl/gskglrenderops.c                         |   36 +-
 gsk/gl/gskglrenderopsprivate.h                  |  125 +-
 gsk/gl/gskglshaderbuilder.c                     |   68 +-
 gsk/gl/gskglshaderbuilderprivate.h              |    2 +
 gsk/gl/opbuffer.c                               |    2 +
 gsk/gl/opbuffer.h                               |   15 +
 gsk/gsk.h                                       |    1 +
 gsk/gskenums.h                                  |   32 +-
 gsk/gskglshader.c                               | 1394 +++++++++++++++++++++++
 gsk/gskglshader.h                               |  162 +++
 gsk/gskglshaderprivate.h                        |   19 +
 gsk/gskrendernode.h                             |   21 +
 gsk/gskrendernodeimpl.c                         |  220 ++++
 gsk/gskrendernodeparser.c                       |  336 +++++-
 gsk/gskrendernodeprivate.h                      |    2 +-
 gsk/meson.build                                 |    3 +
 gsk/resources/glsl/blend.glsl                   |    6 +-
 gsk/resources/glsl/blit.glsl                    |    4 +-
 gsk/resources/glsl/blur.glsl                    |    8 +-
 gsk/resources/glsl/border.glsl                  |   30 +-
 gsk/resources/glsl/color.glsl                   |    4 +-
 gsk/resources/glsl/color_matrix.glsl            |    4 +-
 gsk/resources/glsl/coloring.glsl                |    6 +-
 gsk/resources/glsl/cross_fade.glsl              |    6 +-
 gsk/resources/glsl/custom.glsl                  |   21 +
 gsk/resources/glsl/inset_shadow.glsl            |   30 +-
 gsk/resources/glsl/linear_gradient.glsl         |   12 +-
 gsk/resources/glsl/outset_shadow.glsl           |   20 +-
 gsk/resources/glsl/preamble.fs.glsl             |   32 +-
 gsk/resources/glsl/preamble.glsl                |   16 +-
 gsk/resources/glsl/preamble.vs.glsl             |   14 +-
 gsk/resources/glsl/radial_gradient.glsl         |   16 +-
 gsk/resources/glsl/repeat.glsl                  |    4 +-
 gsk/resources/glsl/unblurred_outset_shadow.glsl |   30 +-
 gsk/vulkan/gskvulkanrenderpass.c                |    1 +
 gtk/css/gtkcssparserprivate.h                   |    3 +
 gtk/gtkcssparserprivate.h                       |    9 -
 gtk/gtksnapshot.c                               |  199 ++++
 gtk/gtksnapshot.h                               |    8 +-
 gtk/gtkwindow.c                                 |    6 +-
 gtk/inspector/recorder.c                        |  136 +++
 testsuite/gsk/meson.build                       |    1 +
 testsuite/gsk/shader.c                          |  215 ++++
 67 files changed, 5336 insertions(+), 240 deletions(-)
---


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