[gtk: 3/3] Merge branch 'matthiasc/for-master' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit 8d6c7b81e996ca2cc7197705f6cceda9fd4b027c
Merge: fcaadf6724 900a4e4d31
Author: Matthias Clasen <mclasen redhat com>
Date:   Sat Apr 3 20:14:29 2021 +0000

    Merge branch 'matthiasc/for-master' into 'master'
    
    gsk: Rename resource paths
    
    See merge request GNOME/gtk!3399

 gsk/gen-gsk-gresources-xml.py                      |   6 ++--
 gsk/gl/gskglrenderer.c                             |  36 +++++++++----------
 gsk/{resources/glsl => gl/resources}/blend.glsl    |   0
 gsk/{resources/glsl => gl/resources}/blit.glsl     |   0
 gsk/{resources/glsl => gl/resources}/blur.glsl     |   0
 gsk/{resources/glsl => gl/resources}/border.glsl   |   0
 gsk/{resources/glsl => gl/resources}/color.glsl    |   0
 .../glsl => gl/resources}/color_matrix.glsl        |   0
 gsk/{resources/glsl => gl/resources}/coloring.glsl |   0
 .../glsl => gl/resources}/conic_gradient.glsl      |   0
 .../glsl => gl/resources}/cross_fade.glsl          |   0
 gsk/{resources/glsl => gl/resources}/custom.glsl   |   0
 .../glsl => gl/resources}/inset_shadow.glsl        |   0
 .../glsl => gl/resources}/linear_gradient.glsl     |   0
 .../glsl => gl/resources}/outset_shadow.glsl       |   0
 .../glsl => gl/resources}/preamble.fs.glsl         |   0
 gsk/{resources/glsl => gl/resources}/preamble.glsl |   0
 .../glsl => gl/resources}/preamble.vs.glsl         |   0
 .../glsl => gl/resources}/radial_gradient.glsl     |   0
 gsk/{resources/glsl => gl/resources}/repeat.glsl   |   0
 .../resources}/unblurred_outset_shadow.glsl        |   0
 gsk/meson.build                                    |  40 ++++++++++-----------
 .../resources}/blendmode-clip-rounded.frag.spv     | Bin
 .../resources}/blendmode-clip-rounded.vert.spv     | Bin
 .../resources}/blendmode-clip.frag.spv             | Bin
 .../resources}/blendmode-clip.vert.spv             | Bin
 .../resources}/blendmode-rect-rounded.frag.spv     | Bin
 .../resources}/blendmode-rect.frag.spv             | Bin
 .../vulkan => vulkan/resources}/blendmode.frag     |   0
 .../vulkan => vulkan/resources}/blendmode.frag.spv | Bin
 .../vulkan => vulkan/resources}/blendmode.vert     |   0
 .../vulkan => vulkan/resources}/blendmode.vert.spv | Bin
 .../resources}/blur-clip-rounded.frag.spv          | Bin
 .../resources}/blur-clip-rounded.vert.spv          | Bin
 .../vulkan => vulkan/resources}/blur-clip.frag.spv | Bin
 .../vulkan => vulkan/resources}/blur-clip.vert.spv | Bin
 .../vulkan => vulkan/resources}/blur.frag          |   0
 .../vulkan => vulkan/resources}/blur.frag.spv      | Bin
 .../vulkan => vulkan/resources}/blur.vert          |   0
 .../vulkan => vulkan/resources}/blur.vert.spv      | Bin
 .../resources}/border-clip-rounded.frag.spv        | Bin
 .../resources}/border-clip-rounded.vert.spv        | Bin
 .../resources}/border-clip.frag.spv                | Bin
 .../resources}/border-clip.vert.spv                | Bin
 .../vulkan => vulkan/resources}/border.frag        |   0
 .../vulkan => vulkan/resources}/border.frag.spv    | Bin
 .../vulkan => vulkan/resources}/border.vert        |   0
 .../vulkan => vulkan/resources}/border.vert.spv    | Bin
 .../vulkan => vulkan/resources}/clip.frag.glsl     |   0
 .../vulkan => vulkan/resources}/clip.vert.glsl     |   0
 .../resources}/color-clip-rounded.frag.spv         | Bin
 .../resources}/color-clip-rounded.vert.spv         | Bin
 .../resources}/color-clip.frag.spv                 | Bin
 .../resources}/color-clip.vert.spv                 | Bin
 .../resources}/color-matrix-clip-rounded.frag.spv  | Bin
 .../resources}/color-matrix-clip-rounded.vert.spv  | Bin
 .../resources}/color-matrix-clip.frag.spv          | Bin
 .../resources}/color-matrix-clip.vert.spv          | Bin
 .../vulkan => vulkan/resources}/color-matrix.frag  |   0
 .../resources}/color-matrix.frag.spv               | Bin
 .../vulkan => vulkan/resources}/color-matrix.vert  |   0
 .../resources}/color-matrix.vert.spv               | Bin
 .../vulkan => vulkan/resources}/color.frag         |   0
 .../vulkan => vulkan/resources}/color.frag.spv     | Bin
 .../vulkan => vulkan/resources}/color.vert         |   0
 .../vulkan => vulkan/resources}/color.vert.spv     | Bin
 .../vulkan => vulkan/resources}/constants.glsl     |   0
 .../resources}/crossfade-clip-rounded.frag.spv     | Bin
 .../resources}/crossfade-clip-rounded.vert.spv     | Bin
 .../resources}/crossfade-clip.frag.spv             | Bin
 .../resources}/crossfade-clip.vert.spv             | Bin
 .../resources}/crossfade-rect.vert.spv             | Bin
 .../vulkan => vulkan/resources}/crossfade.frag     |   0
 .../vulkan => vulkan/resources}/crossfade.frag.spv | Bin
 .../vulkan => vulkan/resources}/crossfade.vert     |   0
 .../vulkan => vulkan/resources}/crossfade.vert.spv | Bin
 .../resources}/inset-shadow-clip-rounded.frag.spv  | Bin
 .../resources}/inset-shadow-clip-rounded.vert.spv  | Bin
 .../resources}/inset-shadow-clip.frag.spv          | Bin
 .../resources}/inset-shadow-clip.vert.spv          | Bin
 .../vulkan => vulkan/resources}/inset-shadow.frag  |   0
 .../resources}/inset-shadow.frag.spv               | Bin
 .../vulkan => vulkan/resources}/inset-shadow.vert  |   0
 .../resources}/inset-shadow.vert.spv               | Bin
 .../resources}/linear-clip-rounded.frag.spv        | Bin
 .../resources}/linear-clip-rounded.vert.spv        | Bin
 .../resources}/linear-clip.frag.spv                | Bin
 .../resources}/linear-clip.vert.spv                | Bin
 .../vulkan => vulkan/resources}/linear.frag        |   0
 .../vulkan => vulkan/resources}/linear.frag.spv    | Bin
 .../vulkan => vulkan/resources}/linear.vert        |   0
 .../vulkan => vulkan/resources}/linear.vert.spv    | Bin
 .../resources}/mask-clip-rounded.frag.spv          | Bin
 .../resources}/mask-clip-rounded.vert.spv          | Bin
 .../vulkan => vulkan/resources}/mask-clip.frag.spv | Bin
 .../vulkan => vulkan/resources}/mask-clip.vert.spv | Bin
 .../vulkan => vulkan/resources}/mask.frag          |   0
 .../vulkan => vulkan/resources}/mask.frag.spv      | Bin
 .../vulkan => vulkan/resources}/mask.vert          |   0
 .../vulkan => vulkan/resources}/mask.vert.spv      | Bin
 .../vulkan => vulkan/resources}/meson.build        |   0
 .../resources}/outset-shadow-clip-rounded.frag.spv | Bin
 .../resources}/outset-shadow-clip-rounded.vert.spv | Bin
 .../resources}/outset-shadow-clip.frag.spv         | Bin
 .../resources}/outset-shadow-clip.vert.spv         | Bin
 .../vulkan => vulkan/resources}/outset-shadow.frag |   0
 .../resources}/outset-shadow.frag.spv              | Bin
 .../vulkan => vulkan/resources}/outset-shadow.vert |   0
 .../resources}/outset-shadow.vert.spv              | Bin
 .../vulkan => vulkan/resources}/rounded-rect.glsl  |   0
 .../resources}/texture-clip-rounded.frag.spv       | Bin
 .../resources}/texture-clip-rounded.vert.spv       | Bin
 .../resources}/texture-clip.frag.spv               | Bin
 .../resources}/texture-clip.vert.spv               | Bin
 .../vulkan => vulkan/resources}/texture.frag       |   0
 .../vulkan => vulkan/resources}/texture.frag.spv   | Bin
 .../vulkan => vulkan/resources}/texture.vert       |   0
 .../vulkan => vulkan/resources}/texture.vert.spv   | Bin
 118 files changed, 41 insertions(+), 41 deletions(-)
---