callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

demo: Change the resource path for the shaders

Browse Source 
We need to use the same name as the "plugin" so that the main UI will
display the resources inside a notebook tab.
This commit is contained in:
Emmanuele Bassi
2015-02-09 19:32:38 +00:00
parent 843475bd2e
commit 6bf55142ee
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
demos/gtk-demo/demo.gresource.xml
View File

@ -140,7 +140,7 @@
<gresource prefix="/popover"> <gresource prefix="/popover">
<file>popover.ui</file> <file>popover.ui</file>
</gresource> </gresource>
<gresource prefix="/shaders"> <gresource prefix="/glarea">
<file>glarea-fragment.glsl</file> <file>glarea-fragment.glsl</file>
<file>glarea-vertex.glsl</file> <file>glarea-vertex.glsl</file>
</gresource> </gresource>

4
demos/gtk-demo/glarea.c
View File

@ -102,7 +102,7 @@ init_shaders (GLuint *program_out,
int status; int status;
GBytes *source; GBytes *source;
source = g_resources_lookup_data ("/shaders/glarea-vertex.glsl", 0, NULL); source = g_resources_lookup_data ("/glarea/glarea-vertex.glsl", 0, NULL);
vertex = create_shader (GL_VERTEX_SHADER, g_bytes_get_data (source, NULL)); vertex = create_shader (GL_VERTEX_SHADER, g_bytes_get_data (source, NULL));
g_bytes_unref (source); g_bytes_unref (source);
@ -112,7 +112,7 @@ init_shaders (GLuint *program_out,
return; return;
} }
source = g_resources_lookup_data ("/shaders/glarea-fragment.glsl", 0, NULL); source = g_resources_lookup_data ("/glarea/glarea-fragment.glsl", 0, NULL);
fragment = create_shader (GL_FRAGMENT_SHADER, g_bytes_get_data (source, NULL)); fragment = create_shader (GL_FRAGMENT_SHADER, g_bytes_get_data (source, NULL));
g_bytes_unref (source); g_bytes_unref (source);