diff options
author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-04-29 07:21:48 +0300 |
---|---|---|
committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-04-29 08:11:31 +0300 |
commit | baa7cc6531fc4d7764128289d49a8746a27239fa (patch) | |
tree | 7e5a692fc5d172829a1b180328db8385678e2fff /src/datavisualization/engine/shaders/texture_ES2.frag | |
parent | a7ba1a313eb620e275608c0627efbc1e2c2b40c0 (diff) |
Android GLSL linker fix
Task-number: QTRD-3059
Change-Id: Ie5b82c6418cb87f7d9c04fcca287f5924d8616a5
Change-Id: Ie5b82c6418cb87f7d9c04fcca287f5924d8616a5
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src/datavisualization/engine/shaders/texture_ES2.frag')
-rw-r--r-- | src/datavisualization/engine/shaders/texture_ES2.frag | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/datavisualization/engine/shaders/texture_ES2.frag b/src/datavisualization/engine/shaders/texture_ES2.frag index d82c12fe..82ad6614 100644 --- a/src/datavisualization/engine/shaders/texture_ES2.frag +++ b/src/datavisualization/engine/shaders/texture_ES2.frag @@ -4,8 +4,8 @@ varying highp vec3 position_wrld; varying highp vec3 normal_cmr; varying highp vec3 eyeDirection_cmr; varying highp vec3 lightDirection_cmr; +varying highp vec3 lightPosition_wrld_frag; -uniform highp vec3 lightPosition_wrld; uniform highp sampler2D textureSampler; uniform highp float lightStrength; uniform highp float ambientStrength; @@ -16,7 +16,7 @@ void main() { highp vec3 materialAmbientColor = lightColor.rgb * ambientStrength * materialDiffuseColor; highp vec3 materialSpecularColor = lightColor.rgb; - highp float distance = length(lightPosition_wrld - position_wrld); + highp float distance = length(lightPosition_wrld_frag - position_wrld); highp vec3 n = normalize(normal_cmr); highp vec3 l = normalize(lightDirection_cmr); |