diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-18 18:00:52 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-18 21:25:09 +0100 |
| commit | c6a8bae2563bf883b483c5bfa8b2caf15a1fb33b (patch) | |
| tree | 6ed846020c66b638a9f2895749d2104fd7d33c1f /src/datavisualization/engine/shaders/surfaceTexturedShadowFlat.frag | |
| parent | 7dd95d1d4cb65662a9bbb739163b7e12f3d81a84 (diff) | |
| parent | 172dbad2db094148323fd8a9e6ab44c72a9fa88e (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
.qmake.conf
Change-Id: I4e39ad733fec72e2233cd16fc50c96ca96280782
Diffstat (limited to 'src/datavisualization/engine/shaders/surfaceTexturedShadowFlat.frag')
| -rw-r--r-- | src/datavisualization/engine/shaders/surfaceTexturedShadowFlat.frag | 2 |
1 files changed, 1 insertions, 1 deletions
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; |