diff options
author | Eric Guzman | 2012-06-20 19:42:03 -0700 |
---|---|---|
committer | Eric Guzman | 2012-06-20 19:42:03 -0700 |
commit | 3270aac4980c908f305fb53abadda5121ff6b9cb (patch) | |
tree | 6255aaab239fde71b1f4862dd70de7be62f48b85 /assets/shaders/Taper.vert.glsl | |
parent | a5d93daf6fdccbfee160d6a8ba08f6b6d4b9d7cc (diff) | |
parent | 87377c81da06abf6d656017859830a3ab2902f0e (diff) | |
download | ninja-3270aac4980c908f305fb53abadda5121ff6b9cb.tar.gz |
Merge branch 'binding' of github.com:dhg637/ninja-internal into binding
Diffstat (limited to 'assets/shaders/Taper.vert.glsl')
-rw-r--r-- | assets/shaders/Taper.vert.glsl | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/assets/shaders/Taper.vert.glsl b/assets/shaders/Taper.vert.glsl index 30b73456..eb562c2f 100644 --- a/assets/shaders/Taper.vert.glsl +++ b/assets/shaders/Taper.vert.glsl | |||
@@ -24,8 +24,6 @@ uniform float u_minVal; | |||
24 | uniform float u_maxVal; | 24 | uniform float u_maxVal; |
25 | uniform float u_center; | 25 | uniform float u_center; |
26 | 26 | ||
27 | uniform vec4 color; | ||
28 | |||
29 | 27 | ||
30 | // matrix uniforms | 28 | // matrix uniforms |
31 | uniform mat4 u_mvMatrix; | 29 | uniform mat4 u_mvMatrix; |