diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-04-03 08:10:58 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-04-03 08:10:58 -0400 |
| commit | ee63b84b6ab6fb8b342d5ea7a0441765a078c33b (patch) | |
| tree | c57683cba0d73f17c7388ab81efde61a8e136f2c | |
| parent | 2f1ff307da6fd6423b38c43aade003f012d4b8e8 (diff) | |
| download | gtk+-ee63b84b6ab6fb8b342d5ea7a0441765a078c33b.tar.gz | |
gsk: Rename resource paths
Make the shaders of the gl renderer live under
/org/gtk/libgsk/gl. This is purely cosmetic.
| -rw-r--r-- | gsk/gen-gsk-gresources-xml.py | 2 | ||||
| -rw-r--r-- | gsk/gl/gskglrenderer.c | 36 |
2 files changed, 19 insertions, 19 deletions
diff --git a/gsk/gen-gsk-gresources-xml.py b/gsk/gen-gsk-gresources-xml.py index 16a2c4042a..404380e27b 100644 --- a/gsk/gen-gsk-gresources-xml.py +++ b/gsk/gen-gsk-gresources-xml.py @@ -45,7 +45,7 @@ xml = '''<?xml version='1.0' encoding='UTF-8'?> ''' for f in gl_source_shaders: - xml += ' <file alias=\'glsl/{0}\'>resources/glsl/{0}</file>\n'.format(os.path.basename(f)) + xml += ' <file alias=\'gl/{0}\'>resources/glsl/{0}</file>\n'.format(os.path.basename(f)) xml += '\n' diff --git a/gsk/gl/gskglrenderer.c b/gsk/gl/gskglrenderer.c index a68b45e663..c72cedaeb4 100644 --- a/gsk/gl/gskglrenderer.c +++ b/gsk/gl/gskglrenderer.c @@ -3313,27 +3313,27 @@ gsk_gl_renderer_create_programs (GskGLRenderer *self, const char *resource_path; const char *name; } program_definitions[] = { - { "/org/gtk/libgsk/glsl/blend.glsl", "blend" }, - { "/org/gtk/libgsk/glsl/blit.glsl", "blit" }, - { "/org/gtk/libgsk/glsl/blur.glsl", "blur" }, - { "/org/gtk/libgsk/glsl/border.glsl", "border" }, - { "/org/gtk/libgsk/glsl/color_matrix.glsl", "color matrix" }, - { "/org/gtk/libgsk/glsl/color.glsl", "color" }, - { "/org/gtk/libgsk/glsl/coloring.glsl", "coloring" }, - { "/org/gtk/libgsk/glsl/cross_fade.glsl", "cross fade" }, - { "/org/gtk/libgsk/glsl/inset_shadow.glsl", "inset shadow" }, - { "/org/gtk/libgsk/glsl/linear_gradient.glsl", "linear gradient" }, - { "/org/gtk/libgsk/glsl/radial_gradient.glsl", "radial gradient" }, - { "/org/gtk/libgsk/glsl/conic_gradient.glsl", "conic gradient" }, - { "/org/gtk/libgsk/glsl/outset_shadow.glsl", "outset shadow" }, - { "/org/gtk/libgsk/glsl/repeat.glsl", "repeat" }, - { "/org/gtk/libgsk/glsl/unblurred_outset_shadow.glsl", "unblurred_outset shadow" }, + { "/org/gtk/libgsk/gl/blend.glsl", "blend" }, + { "/org/gtk/libgsk/gl/blit.glsl", "blit" }, + { "/org/gtk/libgsk/gl/blur.glsl", "blur" }, + { "/org/gtk/libgsk/gl/border.glsl", "border" }, + { "/org/gtk/libgsk/gl/color_matrix.glsl", "color matrix" }, + { "/org/gtk/libgsk/gl/color.glsl", "color" }, + { "/org/gtk/libgsk/gl/coloring.glsl", "coloring" }, + { "/org/gtk/libgsk/gl/cross_fade.glsl", "cross fade" }, + { "/org/gtk/libgsk/gl/inset_shadow.glsl", "inset shadow" }, + { "/org/gtk/libgsk/gl/linear_gradient.glsl", "linear gradient" }, + { "/org/gtk/libgsk/gl/radial_gradient.glsl", "radial gradient" }, + { "/org/gtk/libgsk/gl/conic_gradient.glsl", "conic gradient" }, + { "/org/gtk/libgsk/gl/outset_shadow.glsl", "outset shadow" }, + { "/org/gtk/libgsk/gl/repeat.glsl", "repeat" }, + { "/org/gtk/libgsk/gl/unblurred_outset_shadow.glsl", "unblurred_outset shadow" }, }; gsk_gl_shader_builder_init (&shader_builder, - "/org/gtk/libgsk/glsl/preamble.glsl", - "/org/gtk/libgsk/glsl/preamble.vs.glsl", - "/org/gtk/libgsk/glsl/preamble.fs.glsl"); + "/org/gtk/libgsk/gl/preamble.glsl", + "/org/gtk/libgsk/gl/preamble.vs.glsl", + "/org/gtk/libgsk/gl/preamble.fs.glsl"); g_assert (G_N_ELEMENTS (program_definitions) == GL_N_PROGRAMS); |