Merge remote-tracking branch 'origin/5.9' into dev

Change-Id: I4ceccd338a937a2ada231f568ed02c7a87bd6e80

4 files changed, 9 insertions, 8 deletions

diff --git a/src/extras/shaders/gl3/distancefieldtext.frag b/src/extras/shaders/gl3/distancefieldtext.frag
index 4f0c9cac0..c53f3df55 100644
--- a/src/extras/shaders/gl3/distancefieldtext.frag
+++ b/src/extras/shaders/gl3/distancefieldtext.frag
@@ -1,4 +1,4 @@
-#version 150 core
+#version 130
 
 uniform sampler2D distanceFieldTexture;
 uniform float minAlpha;
@@ -6,8 +6,8 @@ uniform float maxAlpha;
 uniform float textureSize;
 uniform vec4 color;
 
-in vec3 position;
 in vec2 texCoord;
+in float zValue;
 
 out vec4 fragColor;
 
@@ -35,4 +35,5 @@ void main()
 
     float distVal = texture(distanceFieldTexture, texCoord).r;
     fragColor = color * smoothstep(minAlpha, maxAlpha, distVal);
+    gl_FragDepth = gl_FragCoord.z - zValue * 0.00001;
 }
diff --git a/src/extras/shaders/gl3/distancefieldtext.vert b/src/extras/shaders/gl3/distancefieldtext.vert
index 9bd2a0a90..74a48f426 100644
--- a/src/extras/shaders/gl3/distancefieldtext.vert
+++ b/src/extras/shaders/gl3/distancefieldtext.vert
@@ -1,10 +1,10 @@
-#version 150 core
+#version 130
 
 in vec3 vertexPosition;
 in vec2 vertexTexCoord;
 
-out vec3 position;
 out vec2 texCoord;
+out float zValue;
 
 uniform mat4 modelView;
 uniform mat4 mvp;
@@ -12,8 +12,8 @@ uniform mat4 mvp;
 void main()
 {
     texCoord = vertexTexCoord;
-    position = vec3(modelView * vec4(vertexPosition, 1.0));
+    zValue = vertexPosition.z;
 
-    gl_Position = mvp * vec4(vertexPosition, 1.0);
+    gl_Position = mvp * vec4(vertexPosition.xy, 0.0, 1.0);
 }
 
diff --git a/src/extras/shaders/gl3/skybox.frag b/src/extras/shaders/gl3/skybox.frag
index 931e20343..d8d23990f 100644
--- a/src/extras/shaders/gl3/skybox.frag
+++ b/src/extras/shaders/gl3/skybox.frag
@@ -1,4 +1,4 @@
-#version 140
+#version 130
 
 in vec3 texCoord0;
 out vec4 fragColor;
diff --git a/src/extras/shaders/gl3/skybox.vert b/src/extras/shaders/gl3/skybox.vert
index b5b0c0617..a92303aa8 100644
--- a/src/extras/shaders/gl3/skybox.vert
+++ b/src/extras/shaders/gl3/skybox.vert
@@ -1,4 +1,4 @@
-#version 140
+#version 130
 
 in vec3 vertexPosition;
 out vec3 texCoord0;