diff options
| author | Armen Kesablyan | 2012-06-20 15:00:34 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-06-20 15:00:34 -0700 |
| commit | 38f571d1fdf02d36c3816637af7b2ca2493809da (patch) | |
| tree | 69b97839be8b2b6fb65e9150d4dc02856041fb1d /assets/shaders/Taper.vert.glsl | |
| parent | f7c14e54c52bce8875cde81db621dde6f4ff1e34 (diff) | |
| parent | 120e31dcf1e11eed11ee430d77c438e7b073e9f8 (diff) | |
| download | ninja-38f571d1fdf02d36c3816637af7b2ca2493809da.tar.gz | |
Merge branch 'refs/heads/master' 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; |