AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-27 14:10:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'wip/exalm/shader' into 'master'

Browse Source 
gsk: Fix shader gresource paths

See merge request GNOME/gtk!3453
This commit is contained in:
Matthias Clasen 2021-04-19 18:01:44 +00:00
commit 435ed3158c
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gsk/gl/gskglrenderer.c
View File

@ -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);

8
gsk/ngl/gskngldriver.c
View File

@ -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 */