From 8aa6485d78e1b7ac32d10a28aaa1bca4541ac132 Mon Sep 17 00:00:00 2001
From: Ykkrosh <philip@wildfiregames.com>
Date: Sat, 2 Nov 2013 22:58:38 +0000
Subject: [PATCH] Fix shader errors with OpenGL ES

This was SVN commit r14067.
---
 .../data/mods/public/shaders/glsl/model_common.fs |  2 +-
 .../data/mods/public/shaders/glsl/model_common.vs | 15 ++++++++++-----
 .../mods/public/shaders/glsl/terrain_common.fs    |  4 ++--
 .../mods/public/shaders/glsl/terrain_common.vs    | 11 ++++++++++-
 4 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/binaries/data/mods/public/shaders/glsl/model_common.fs b/binaries/data/mods/public/shaders/glsl/model_common.fs
index 760527430d..0e2273dca4 100644
--- a/binaries/data/mods/public/shaders/glsl/model_common.fs
+++ b/binaries/data/mods/public/shaders/glsl/model_common.fs
@@ -130,7 +130,7 @@ void main()
     float height = 1.0;
     float scale = effectSettings.z;
       
-    scale = (scale * (PARALLAX_DIST_MAX - dist)) / PARALLAX_DIST_MAX;
+    scale = (scale * (float(PARALLAX_DIST_MAX) - dist)) / float(PARALLAX_DIST_MAX);
 
     float iter = 8.0;
     #if USE_HQ_PARALLAX
diff --git a/binaries/data/mods/public/shaders/glsl/model_common.vs b/binaries/data/mods/public/shaders/glsl/model_common.vs
index 395080e8f4..2f8d66fa66 100644
--- a/binaries/data/mods/public/shaders/glsl/model_common.vs
+++ b/binaries/data/mods/public/shaders/glsl/model_common.vs
@@ -2,8 +2,13 @@
 
 uniform mat4 transform;
 uniform vec3 cameraPos;
+#ifdef GL_ES
+uniform mediump vec3 sunDir;
+uniform mediump vec3 sunColor;
+#else
 uniform vec3 sunDir;
 uniform vec3 sunColor;
+#endif
 uniform vec2 losTransform;
 uniform mat4 shadowTransform;
 uniform mat4 instancingTransform;
@@ -107,7 +112,7 @@ void main()
     // fractional part of model position, clamped to >.4
     vec4 modelPos = instancingTransform[3];
     modelPos = fract(modelPos);
-    modelPos = clamp(modelPos, 0.4, 1);
+    modelPos = clamp(modelPos, 0.4, 1.0);
 
     // crude measure of wind intensity
     float abswind = abs(wind.x) + abs(wind.y);
@@ -115,16 +120,16 @@ void main()
     vec4 cosVec;
     // these determine the speed of the wind's "cosine" waves.
     cosVec.x = sim_time.x * modelPos[0] + position.x;
-    cosVec.y = sim_time.x * modelPos[2] / 3 + instancingTransform[3][0];
-    cosVec.z = sim_time.x * abswind / 4 + position.z;
+    cosVec.y = sim_time.x * modelPos[2] / 3.0 + instancingTransform[3][0];
+    cosVec.z = sim_time.x * abswind / 4.0 + position.z;
 
     // calculate "cosines" in parallel, using a smoothed triangle wave
     cosVec = fakeCos(cosVec);
 
-    float limit = clamp((a_vertex.x * a_vertex.z * a_vertex.y) / 3000, 0, 0.2);
+    float limit = clamp((a_vertex.x * a_vertex.z * a_vertex.y) / 3000.0, 0.0, 0.2);
 
     float diff = cosVec.x * limit; 
-    float diff2 = cosVec.y * clamp(a_vertex.y / 60, 0, 0.25);
+    float diff2 = cosVec.y * clamp(a_vertex.y / 60.0, 0.0, 0.25);
 
     // fluttering of model parts based on distance from model center (ie longer branches)
     position.xyz += cosVec.z * limit * clamp(abswind, 1.2, 1.7);
diff --git a/binaries/data/mods/public/shaders/glsl/terrain_common.fs b/binaries/data/mods/public/shaders/glsl/terrain_common.fs
index b8a241e157..b7dc83ac87 100644
--- a/binaries/data/mods/public/shaders/glsl/terrain_common.fs
+++ b/binaries/data/mods/public/shaders/glsl/terrain_common.fs
@@ -98,7 +98,7 @@ float get_shadow()
 #if USE_TRIPLANAR
 vec4 triplanar(sampler2D sampler, vec3 wpos)
 {
-	float tighten = 0.4679f;
+	float tighten = 0.4679;
 
 	vec3 blending = abs(normalize(v_normal)) - tighten;
 	blending = max(blending, 0.0);
@@ -121,7 +121,7 @@ vec4 triplanar(sampler2D sampler, vec3 wpos)
 
 vec4 triplanarNormals(sampler2D sampler, vec3 wpos)
 {
-	float tighten = 0.4679f;
+	float tighten = 0.4679;
 
 	vec3 blending = abs(normalize(v_normal)) - tighten;
 	blending = max(blending, 0.0);
diff --git a/binaries/data/mods/public/shaders/glsl/terrain_common.vs b/binaries/data/mods/public/shaders/glsl/terrain_common.vs
index 336e4a5cde..42d1174dee 100644
--- a/binaries/data/mods/public/shaders/glsl/terrain_common.vs
+++ b/binaries/data/mods/public/shaders/glsl/terrain_common.vs
@@ -2,8 +2,13 @@
 
 uniform mat4 transform;
 uniform vec3 cameraPos;
+#ifdef GL_ES
+uniform mediump vec3 sunDir;
+uniform mediump vec3 sunColor;
+#else
 uniform vec3 sunDir;
 uniform vec3 sunColor;
+#endif
 uniform vec2 textureTransform;
 uniform vec2 losTransform;
 uniform mat4 shadowTransform;
@@ -76,7 +81,11 @@ void main()
 
     #if GL_ES
       // XXX: Ugly hack to hide some precision issues in GLES
-      v_tex = mod(v_tex, vec2(9.0, 9.0));
+      #if USE_TRIPLANAR
+        v_tex = mod(v_tex, vec3(9.0, 9.0, 9.0));
+      #else
+        v_tex = mod(v_tex, vec2(9.0, 9.0));
+      #endif
     #endif
   #endif