[gtk/wip/exalm/shader] gsk: Fix shader gresource paths
- From: Alexander Mikhaylenko <alexm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/wip/exalm/shader] gsk: Fix shader gresource paths
- Date: Mon, 19 Apr 2021 15:02:41 +0000 (UTC)
commit ae7f380396c5e4d4d6cc823752b692671b395503
Author: Alexander Mikhaylenko <alexm gnome org>
Date: Mon Apr 19 19:59:58 2021 +0500
gsk: Fix shader gresource paths
They were never updated after having been moved.
gsk/gl/gskglrenderer.c | 8 ++++----
gsk/ngl/gskngldriver.c | 8 ++++----
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 */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]