aboutsummaryrefslogtreecommitdiff
path: root/assets/descriptor.json
diff options
context:
space:
mode:
authorValerio Virgillito2012-03-22 15:47:56 -0700
committerValerio Virgillito2012-03-22 15:47:56 -0700
commitfdeed8051c3af538d28ca3bc599121cea483c22c (patch)
treecd5db2db7a04fb1e3035132a840076480706e0e3 /assets/descriptor.json
parent5308a9404ef131ba6457eec840b017a3e436b9da (diff)
downloadninja-fdeed8051c3af538d28ca3bc599121cea483c22c.tar.gz
Squashed commit of the following GL integration
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'assets/descriptor.json')
-rw-r--r--assets/descriptor.json4
1 files changed, 4 insertions, 0 deletions
diff --git a/assets/descriptor.json b/assets/descriptor.json
index af0520dd..85fbc996 100644
--- a/assets/descriptor.json
+++ b/assets/descriptor.json
@@ -21,6 +21,9 @@
21 "images/cubelight.png", 21 "images/cubelight.png",
22 "images/random_normal.png", 22 "images/random_normal.png",
23 "images/white.png", 23 "images/white.png",
24 "images/paris.png",
25 "images/powderblue.png",
26 "images/raiders.png",
24 "shaders/Basic.frag.glsl", 27 "shaders/Basic.frag.glsl",
25 "shaders/TwistVert.vert.glsl", 28 "shaders/TwistVert.vert.glsl",
26 "shaders/Basic.vert.glsl", 29 "shaders/Basic.vert.glsl",
@@ -36,6 +39,7 @@
36 "shaders/Keleidoscope.frag.glsl", 39 "shaders/Keleidoscope.frag.glsl",
37 "shaders/plasma.frag.glsl", 40 "shaders/plasma.frag.glsl",
38 "shaders/Mandel.frag.glsl", 41 "shaders/Mandel.frag.glsl",
42 "shaders/Paris.frag.glsl",
39 "shaders/plasma.vert.glsl", 43 "shaders/plasma.vert.glsl",
40 "shaders/Pulse.frag.glsl", 44 "shaders/Pulse.frag.glsl",
41 "shaders/radialBlur.frag.glsl", 45 "shaders/radialBlur.frag.glsl",