From c15949d86a6bfbefd12a10b67ed840eaaaf2c52c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= Date: Wed, 23 Oct 2013 10:26:34 +0300 Subject: Dropped flat shader requirement from 1.50 to 1.20 Task-number: QTRD-2287 - still does not work on ES2, as it's GLSL ES 1.0 Change-Id: I17cdb893daef35e83269ea2a73180fdaf3caca80 Change-Id: I17cdb893daef35e83269ea2a73180fdaf3caca80 Reviewed-by: Mika Salmela --- src/datavisualization/engine/shaders/surfaceFlat.frag | 6 ++++-- src/datavisualization/engine/shaders/surfaceFlat.vert | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'src/datavisualization/engine/shaders') diff --git a/src/datavisualization/engine/shaders/surfaceFlat.frag b/src/datavisualization/engine/shaders/surfaceFlat.frag index a8a3dbb1..1f2a3822 100644 --- a/src/datavisualization/engine/shaders/surfaceFlat.frag +++ b/src/datavisualization/engine/shaders/surfaceFlat.frag @@ -1,8 +1,10 @@ -#version 150 +#version 120 + +#extension GL_EXT_gpu_shader4 : require varying highp vec3 coords_mdl; varying highp vec3 position_wrld; -flat in highp vec3 normal_cmr; +flat varying highp vec3 normal_cmr; varying highp vec3 eyeDirection_cmr; varying highp vec3 lightDirection_cmr; diff --git a/src/datavisualization/engine/shaders/surfaceFlat.vert b/src/datavisualization/engine/shaders/surfaceFlat.vert index 7e248d02..0d39f6bc 100644 --- a/src/datavisualization/engine/shaders/surfaceFlat.vert +++ b/src/datavisualization/engine/shaders/surfaceFlat.vert @@ -1,4 +1,6 @@ -#version 150 +#version 120 + +#extension GL_EXT_gpu_shader4 : require attribute highp vec3 vertexPosition_mdl; attribute highp vec3 vertexNormal_mdl; @@ -10,7 +12,7 @@ uniform highp mat4 itM; uniform highp vec3 lightPosition_wrld; varying highp vec3 position_wrld; -flat out highp vec3 normal_cmr; +flat varying highp vec3 normal_cmr; varying highp vec3 eyeDirection_cmr; varying highp vec3 lightDirection_cmr; varying highp vec3 coords_mdl; -- cgit v1.2.3