| From f413c5b423250b4fde8f95639ad368d5b02c5b9b Mon Sep 17 00:00:00 2001 |
| From: Alexandros Frantzis <alexandros.frantzis@canonical.com> |
| Date: Wed, 14 Sep 2016 16:00:52 +0300 |
| Subject: [PATCH] data: Remove unused uniforms from shaders |
| |
| Fixes gh-25 |
| --- |
| data/shaders/ideas-lamp-lit.frag | 1 - |
| data/shaders/terrain.frag | 3 --- |
| data/shaders/terrain.vert | 1 - |
| 3 files changed, 5 deletions(-) |
| |
| diff --git a/data/shaders/ideas-lamp-lit.frag b/data/shaders/ideas-lamp-lit.frag |
| index 8664241..e4299c1 100644 |
| --- a/data/shaders/ideas-lamp-lit.frag |
| +++ b/data/shaders/ideas-lamp-lit.frag |
| @@ -6,7 +6,6 @@ struct LightSourceParameters |
| vec4 position; |
| }; |
| LightSourceParameters lightSource[3]; |
| -uniform mat4 modelview; |
| uniform vec4 light0Position; |
| uniform vec4 light1Position; |
| uniform vec4 light2Position; |
| diff --git a/data/shaders/terrain.frag b/data/shaders/terrain.frag |
| index 23bdf19..84d085c 100644 |
| --- a/data/shaders/terrain.frag |
| +++ b/data/shaders/terrain.frag |
| @@ -3,9 +3,6 @@ uniform vec3 uDiffuseColor; |
| uniform vec3 uSpecularColor; |
| uniform float uShininess; |
| uniform float uOpacity; |
| -uniform bool enableDiffuse1; |
| -uniform bool enableDiffuse2; |
| -uniform bool enableSpecular; |
| uniform sampler2D tDiffuse1; |
| uniform sampler2D tDiffuse2; |
| uniform sampler2D tDetail; |
| diff --git a/data/shaders/terrain.vert b/data/shaders/terrain.vert |
| index dd5b863..ee1c8eb 100644 |
| --- a/data/shaders/terrain.vert |
| +++ b/data/shaders/terrain.vert |
| @@ -2,7 +2,6 @@ |
| uniform mat4 modelViewMatrix; |
| uniform mat4 normalMatrix; |
| uniform mat4 projectionMatrix; |
| -uniform mat4 viewMatrix; |
| |
| // Vertex attributes |
| attribute vec3 position; |
| -- |
| 2.8.0.rc3.226.g39d4020 |
| |