summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Mikhaylenko <alexm@gnome.org>2021-04-19 19:59:58 +0500
committerAlexander Mikhaylenko <alexm@gnome.org>2021-04-19 20:01:33 +0500
commitae7f380396c5e4d4d6cc823752b692671b395503 (patch)
treeae1497602f897ca303bf15fe334ebdacaba0991c
parent2e031e47dde324d0fe3002639e2d53dc15157587 (diff)
downloadgtk+-wip/exalm/shader.tar.gz
gsk: Fix shader gresource pathswip/exalm/shader
They were never updated after having been moved.
-rw-r--r--gsk/gl/gskglrenderer.c8
-rw-r--r--gsk/ngl/gskngldriver.c8
2 files changed, 8 insertions, 8 deletions
diff --git a/gsk/gl/gskglrenderer.c b/gsk/gl/gskglrenderer.c
index b7c2ac43c7..8093636219 100644
--- a/gsk/gl/gskglrenderer.c
+++ b/gsk/gl/gskglrenderer.c
@@ -1129,13 +1129,13 @@ compile_glshader (GskGLRenderer *self,
}
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");
init_shader_builder (self, &shader_builder);
program_id = gsk_gl_shader_builder_create_program (&shader_builder,
- "/org/gtk/libgsk/glsl/custom.glsl",
+ "/org/gtk/libgsk/gl/custom.glsl",
shader_source, shader_source_len,
error);
gsk_gl_shader_builder_finish (&shader_builder);
diff --git a/gsk/ngl/gskngldriver.c b/gsk/ngl/gskngldriver.c
index ec30ccf86f..b365519c18 100644
--- a/gsk/ngl/gskngldriver.c
+++ b/gsk/ngl/gskngldriver.c
@@ -1074,16 +1074,16 @@ gsk_ngl_driver_lookup_shader (GskNglDriver *self,
gsk_ngl_compiler_set_preamble_from_resource (compiler,
GSK_NGL_COMPILER_ALL,
- "/org/gtk/libgsk/glsl/preamble.glsl");
+ "/org/gtk/libgsk/ngl/preamble.glsl");
gsk_ngl_compiler_set_preamble_from_resource (compiler,
GSK_NGL_COMPILER_VERTEX,
- "/org/gtk/libgsk/glsl/preamble.vs.glsl");
+ "/org/gtk/libgsk/ngl/preamble.vs.glsl");
gsk_ngl_compiler_set_preamble_from_resource (compiler,
GSK_NGL_COMPILER_FRAGMENT,
- "/org/gtk/libgsk/glsl/preamble.fs.glsl");
+ "/org/gtk/libgsk/ngl/preamble.fs.glsl");
gsk_ngl_compiler_set_source_from_resource (compiler,
GSK_NGL_COMPILER_ALL,
- "/org/gtk/libgsk/glsl/custom.glsl");
+ "/org/gtk/libgsk/ngl/custom.glsl");
gsk_ngl_compiler_set_suffix (compiler, GSK_NGL_COMPILER_FRAGMENT, suffix);
/* Setup attributes that are provided via VBO */