[gtk+] demo: Change the resource path for the shaders
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] demo: Change the resource path for the shaders
- Date: Mon, 9 Feb 2015 19:33:29 +0000 (UTC)
commit 6bf55142ee5e6270180f2d0f23ad42ab7ca08a5d
Author: Emmanuele Bassi <ebassi gnome org>
Date: Mon Feb 9 19:32:38 2015 +0000
demo: Change the resource path for the shaders
We need to use the same name as the "plugin" so that the main UI will
display the resources inside a notebook tab.
demos/gtk-demo/demo.gresource.xml | 2 +-
demos/gtk-demo/glarea.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/demos/gtk-demo/demo.gresource.xml b/demos/gtk-demo/demo.gresource.xml
index e0e294d..a970795 100644
--- a/demos/gtk-demo/demo.gresource.xml
+++ b/demos/gtk-demo/demo.gresource.xml
@@ -140,7 +140,7 @@
<gresource prefix="/popover">
<file>popover.ui</file>
</gresource>
- <gresource prefix="/shaders">
+ <gresource prefix="/glarea">
<file>glarea-fragment.glsl</file>
<file>glarea-vertex.glsl</file>
</gresource>
diff --git a/demos/gtk-demo/glarea.c b/demos/gtk-demo/glarea.c
index fd63e86..ed87ef0 100644
--- a/demos/gtk-demo/glarea.c
+++ b/demos/gtk-demo/glarea.c
@@ -102,7 +102,7 @@ init_shaders (GLuint *program_out,
int status;
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));
g_bytes_unref (source);
@@ -112,7 +112,7 @@ init_shaders (GLuint *program_out,
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));
g_bytes_unref (source);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]