summaryrefslogtreecommitdiffstats
path: root/src/datavisualization/engine/shaders
diff options
context:
space:
mode:
authorMika Salmela <mika.salmela@qt.io>2017-12-14 10:50:15 +0200
committerMika Salmela <mika.salmela@qt.io>2017-12-21 09:52:51 +0000
commit4cd89b61be205fc52ce1b227fe55e4de04196db7 (patch)
tree0053d1d4ef8a092da3676c93d2ae9ebb69cd8137 /src/datavisualization/engine/shaders
parentde346171018b353d2abcfb589e644480c2aa6fd5 (diff)
Fix mixing of vec3 and vec2 for coords_mdl
Vec3 used on fragment shader when vec2 used on vertex shader. On surfaceTextureFlat coords_mdl not used at all, so remove it. Change-Id: I7898db37e7967a7cb9933fe1a05f42a332c06130 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/datavisualization/engine/shaders')
-rw-r--r--src/datavisualization/engine/shaders/surfaceTexturedFlat.frag1
-rw-r--r--src/datavisualization/engine/shaders/surfaceTexturedShadowFlat.frag2
2 files changed, 1 insertions, 2 deletions
diff --git a/src/datavisualization/engine/shaders/surfaceTexturedFlat.frag b/src/datavisualization/engine/shaders/surfaceTexturedFlat.frag
index 7c654e0c..6b1ea91a 100644
--- a/src/datavisualization/engine/shaders/surfaceTexturedFlat.frag
+++ b/src/datavisualization/engine/shaders/surfaceTexturedFlat.frag
@@ -2,7 +2,6 @@
#extension GL_EXT_gpu_shader4 : require
-varying highp vec3 coords_mdl;
varying highp vec3 position_wrld;
flat varying highp vec3 normal_cmr;
varying highp vec3 eyeDirection_cmr;
diff --git a/src/datavisualization/engine/shaders/surfaceTexturedShadowFlat.frag b/src/datavisualization/engine/shaders/surfaceTexturedShadowFlat.frag
index 496f4777..4a4284e1 100644
--- a/src/datavisualization/engine/shaders/surfaceTexturedShadowFlat.frag
+++ b/src/datavisualization/engine/shaders/surfaceTexturedShadowFlat.frag
@@ -2,7 +2,7 @@
#extension GL_EXT_gpu_shader4 : require
-varying highp vec3 coords_mdl;
+varying highp vec2 coords_mdl;
varying highp vec3 position_wrld;
flat varying highp vec3 normal_cmr;
varying highp vec3 eyeDirection_cmr;