Explicitly define fragment exported values.

data/shaders/bloom.frag

@@ -3,6 +3,7 @@ uniform sampler2D tex;
 uniform float low;
 
 in vec2 uv;
+out vec4 FragColor;
 
 void main()
 {
@@ -12,5 +13,5 @@ void main()
 
 	col *= smoothstep(low, 0.9, luma);
 
-	gl_FragColor = vec4(col, 1.0);
+	FragColor = vec4(col, 1.0);
 }

data/shaders/bloomblend.frag

@@ -2,6 +2,7 @@
 uniform sampler2D tex;
 
 in vec2 uv;
+out vec4 FragColor;
 
 void main()
 {
@@ -9,5 +10,5 @@ void main()
 
 	col.xyz *= 10.0 * col.a;
 
-	gl_FragColor = vec4(col.xyz, 1.);
+	FragColor = vec4(col.xyz, 1.);
 }

data/shaders/bloompower.frag

@@ -2,11 +2,13 @@
 uniform float power;
 uniform sampler2D tex;
 
+out vec4 FragColor;
+
 void main()
 {
 	vec4 col = texture(tex, gl_TexCoord[0].xy);
 	if (col.a < 0.5)
 		discard;
 
-	gl_FragColor = vec4(col.xyz, power);
+	FragColor = vec4(col.xyz, power);
 }

data/shaders/bubble.frag

@@ -18,9 +18,10 @@
 uniform sampler2D tex;
 uniform float transparency;
 in vec2 uv;
+out vec4 FragColor;
 
 void main()
 {
-	gl_FragColor = texture(tex, uv);
-	gl_FragColor.a *= transparency;
+	FragColor = texture(tex, uv);
+	FragColor.a *= transparency;
 }

data/shaders/caustics.frag

@@ -4,6 +4,8 @@ uniform sampler2D caustictex;
 uniform vec2 dir;
 uniform vec2 dir2;
 
+out vec4 FragColor;
+
 void main()
 {
 	vec2 tc = gl_TexCoord[0].xy;
@@ -14,5 +16,5 @@ void main()
 
 	col += caustic * caustic2 * 10.0;
 
-	gl_FragColor = vec4(col, 1.0);
+	FragColor = vec4(col, 1.0);
 }

data/shaders/collapse.frag

@@ -5,6 +5,8 @@ uniform vec2 pixel;
 uniform vec2 multi;
 uniform int size;
 
+out vec4 FragColor;
+
 void main()
 {
 	float res = 0.0;
@@ -22,5 +24,5 @@ void main()
 
 	float old = texture(oldtex, gl_TexCoord[0].xy).x;
 
-	gl_FragColor = vec4(mix(old, res, 0.7));
+	FragColor = vec4(mix(old, res, 0.7));
 }

data/shaders/color_levels.frag

@@ -4,6 +4,7 @@ uniform vec3 inlevel;
 uniform vec2 outlevel;
 
 in vec2 uv;
+out vec4 FragColor;
 
 void main()
 {
@@ -25,5 +26,5 @@ void main()
 	col.rgb = (pow(((col.rgb * 255.0) - inBlack) / (inWhite - inBlack),
                 vec3(1.0 / inGamma)) * (outWhite - outBlack) + outBlack) / 255.0;
   
-	gl_FragColor = vec4(col.rgb, 1.0);
+	FragColor = vec4(col.rgb, 1.0);
 }

data/shaders/coloredquad.frag

@@ -1,7 +1,9 @@
 #version 130
 uniform ivec4 color;
 
+out vec4 FragColor;
+
 void main()
 {
-	gl_FragColor = vec4(color) / 255.;
+	FragColor = vec4(color) / 255.;
 }

data/shaders/colorize.frag

@@ -1,7 +1,9 @@
 #version 130
 uniform vec3 col;
 
+out vec4 FragColor;
+
 void main()
 {
-	gl_FragColor = vec4(col, 1.0);
+	FragColor = vec4(col, 1.0);
 }

data/shaders/colorize_ref.frag

@@ -2,11 +2,13 @@
 uniform vec3 col;
 uniform sampler2D tex;
 
+out vec4 FragColor;
+
 void main()
 {
 	float alpha = texture(tex, gl_TexCoord[0].xy).a;
 	if (alpha < 0.5)
 		discard;
 
-	gl_FragColor = vec4(col, 1.0);
+	FragColor = vec4(col, 1.0);
 }

data/shaders/colortexturedquad.frag

@@ -3,9 +3,10 @@ uniform sampler2D tex;
 
 in vec2 uv;
 in vec4 col;
+out vec4 FragColor;
 
 void main()
 {
 	vec4 res = texture(tex, uv);
-	gl_FragColor = vec4(res.xyz * col.xyz, res.a);
+	FragColor = vec4(res.xyz * col.xyz, res.a);
 }

data/shaders/displace.frag

@@ -8,6 +8,8 @@ in vec2 uv;
 in vec2 edger_uv;
 in float camdist;
 
+out vec4 FragColor;
+
 void main()
 {
 	vec2 tc = uv;
@@ -39,5 +41,5 @@ void main()
 	col.b = step(offset.y, 0.0) * -offset.y;
 	col.a = step(0.0, offset.y) * offset.y;
 
-	gl_FragColor = col;
+	FragColor = col;
 }

data/shaders/fog.frag

@@ -11,6 +11,7 @@ uniform vec3 campos;
 uniform mat4 ipvmat;
 
 in vec2 uv;
+out vec4 FragColor;
 
 void main()
 {
@@ -29,5 +30,5 @@ void main()
 
 	fog = min(fog, fogmax);
 
-	gl_FragColor = vec4(col, fog);
+	FragColor = vec4(col, fog);
 }

data/shaders/gaussian3h.frag

@@ -5,6 +5,7 @@ uniform vec2 pixel;
 // Gaussian separated blur with radius 3.
 
 in vec2 uv;
+out vec4 FragColor;
 
 void main()
 {
@@ -18,5 +19,5 @@ void main()
 	sum += texture(tex, vec2(X + 1.3333 * pixel.x, Y)) * 0.328125;
 	sum += texture(tex, vec2(X + 3.0 * pixel.x, Y)) * 0.03125;
 
-	gl_FragColor = sum;
+	FragColor = sum;
 }

data/shaders/gaussian3v.frag

@@ -5,6 +5,7 @@ uniform vec2 pixel;
 // Gaussian separated blur with radius 3.
 
 in vec2 uv;
+out vec4 FragColor;
 
 void main()
 {
@@ -18,5 +19,5 @@ void main()
 	sum += texture(tex, vec2(X, Y + 1.3333 * pixel.y)) * 0.328125;
 	sum += texture(tex, vec2(X, Y + 3.0 * pixel.y)) * 0.03125;
 
-	gl_FragColor = sum;
+	FragColor = sum;
 }

data/shaders/gaussian6h.frag

@@ -5,6 +5,7 @@ uniform vec2 pixel;
 // Gaussian separated blur with radius 6.
 
 in vec2 uv;
+out vec4 FragColor;
 
 void main()
 {
@@ -20,5 +21,5 @@ void main()
 	sum += texture(tex, vec2(X + 3.26667 * pixel.x, Y)) * 0.083313;
 	sum += texture(tex, vec2(X + 5.13333 * pixel.x, Y)) * 0.00640869;
 
-	gl_FragColor = sum;
+	FragColor = sum;
 }

data/shaders/gaussian6v.frag

@@ -5,6 +5,7 @@ uniform vec2 pixel;
 // Gaussian separated blur with radius 6.
 
 in vec2 uv;
+out vec4 FragColor;
 
 void main()
 {
@@ -20,5 +21,5 @@ void main()
 	sum += texture(tex, vec2(X, Y + 3.26667 * pixel.y)) * 0.083313;
 	sum += texture(tex, vec2(X, Y + 5.13333 * pixel.y)) * 0.00640869;
 
-	gl_FragColor = sum;
+	FragColor = sum;
 }

data/shaders/glow.frag

@@ -2,6 +2,7 @@
 uniform sampler2D tex;
 
 in vec2 uv;
+out vec4 FragColor;
 
 void main()
 {
@@ -15,5 +16,5 @@ void main()
 	col *= vec4(vec3(4.0), 1.5);
     col.a *= 0.6;
     
-	gl_FragColor = col;
+	FragColor = col;
 }

data/shaders/godfade.frag

@@ -1,6 +1,7 @@
 #version 130
 uniform sampler2D tex;
 uniform vec3 col;
+out vec4 FragColor;
 
 void main()
 {
@@ -13,5 +14,5 @@ void main()
 
 	res = res * vec4(mul);
 
-	gl_FragColor = res;
+	FragColor = res;
 }

data/shaders/godray.frag

@@ -6,6 +6,8 @@ uniform vec2 sunpos;
 
 const float decaystep = 0.88;
 
+out vec4 FragColor;
+
 void main()
 {
 	vec2 texc = gl_TexCoord[0].xy;
@@ -26,5 +28,5 @@ void main()
 		decay *= decaystep;
 	}
 
-	gl_FragColor = vec4(col, 1.0) * 0.8;
+	FragColor = vec4(col, 1.0) * 0.8;
 }

data/shaders/grass.frag

@@ -5,10 +5,13 @@ uniform sampler2D tex;
 
 noperspective in vec3 nor;
 in vec2 uv;
+out vec4 Albedo;
+out vec4 NormalDepth;
+out vec4 Specular;
 
 void main()
 {
-	gl_FragData[0] = texture(tex, uv);
-	gl_FragData[1] = vec4(0.5 * normalize(nor) + 0.5, gl_FragCoord.z);
-	gl_FragData[2] = vec4(0.);
+	Albedo = texture(tex, uv);
+	NormalDepth = vec4(0.5 * normalize(nor) + 0.5, gl_FragCoord.z);
+	Specular = vec4(0.);
 }

data/shaders/gum_shield.frag

@@ -26,6 +26,7 @@ uniform float transparency;
 in vec2 uv;
 noperspective in vec3 eyeVec;
 noperspective in vec3 normal;
+out vec4 FragColor;
 
 void main()
 {
@@ -34,5 +35,5 @@ void main()
 	inter = 1.0 - inter;
 	float alpha = inter + 1.0;// * m;
 
-	gl_FragColor = vec4(0.8, 0.16, 0.48, alpha);
+	FragColor = vec4(0.8, 0.16, 0.48, alpha);
 }

data/shaders/lightbeam.frag

@@ -28,6 +28,7 @@ uniform float transparency;
 in vec2 uv;
 noperspective in vec3 eyeVec;
 noperspective in vec3 normal;
+out vec4 FragColor;
 
 void main()
 {
@@ -35,5 +36,5 @@ void main()
 	float m = texture(tex, vec2(0.5, uv.y)).r;
 	float alpha = inter * inter * inter * inter * m;
 
-	gl_FragColor = vec4(1.0, 1.0, 0.8, alpha);
+	FragColor = vec4(1.0, 1.0, 0.8, alpha);
 }

data/shaders/lightblend.frag

@@ -6,6 +6,7 @@ uniform sampler2D specular_map;
 uniform vec3 ambient;
 
 in vec2 uv;
+out vec4 FragColor;
 
 void main()
 {
@@ -16,5 +17,5 @@ void main()
 	float specmap = texture(specular_map, texc).x;
 	float ao = texture(ambient_occlusion, texc).x;
 
-	gl_FragColor = vec4(diffuse + spec * specmap + ao * ambient, 1.0);
+	FragColor = vec4(diffuse + spec * specmap + ao * ambient, 1.0);
 }

data/shaders/mipviz.frag

@@ -3,6 +3,7 @@
 uniform sampler2D tex;
 uniform vec2 texsize;
 uniform int notex;
+out vec4 FragColor;
 
 float miplevel(in vec2 texture_coordinate)
 {
@@ -19,7 +20,7 @@ float miplevel(in vec2 texture_coordinate)
 void main() {
 
 	if (notex != 0) {
-		gl_FragColor = gl_Color;
+		FragColor = gl_Color;
 		return;
 	}
 
@@ -48,5 +49,5 @@ void main() {
 
 	vec3 col = mix(tcol.xyz, mixcol.xyz, mixcol.a);
 
-	gl_FragColor = vec4(col, tcol.a);
+	FragColor = vec4(col, tcol.a);
 }

data/shaders/mlaa_blend2.frag

@@ -9,6 +9,8 @@ uniform sampler2D areaMap;
 
 uniform vec2 PIXEL_SIZE;
 
+out vec4 FragColor;
+
 /**
  * This one just returns the first level of a mip map chain, which allow us to
  * avoid the nasty ddx/ddy warnings, even improving the performance a little
@@ -109,5 +111,5 @@ void main() {
 		areas.ba = Area(abs(d), e1, e2);
 	}
 
-	gl_FragColor = areas;
+	FragColor = areas;
 }

data/shaders/mlaa_color1.frag

@@ -5,6 +5,8 @@ in vec2 uv;
 uniform sampler2D colorMapG;
 const float threshold = 0.1;
 
+out vec4 FragColor;
+
 void main() {
 	vec3 weights = vec3(0.2126,0.7152, 0.0722); // ITU-R BT. 709
 
@@ -23,5 +25,5 @@ void main() {
 	if (dot(edges, vec4(1.0)) == 0.0)
 		discard;
 
-	gl_FragColor = edges;
+	FragColor = edges;
 }

data/shaders/mlaa_neigh3.frag

@@ -1,6 +1,7 @@
 #version 130
 in vec4 offset[2];
 in vec2 uv;
+out vec4 FragColor;
 
 uniform sampler2D blendMap;
 uniform sampler2D colorMap;
@@ -36,5 +37,5 @@ void main() {
 	color = mix(C, Cright, a.a) * w.a + color;
 
 	// Normalize the resulting color and we are finished!
-	gl_FragColor = color / sum;
+	FragColor = color / sum;
 }

data/shaders/motion_blur.frag

@@ -41,6 +41,8 @@ uniform float mask_radius;
 // Maximum height of texture used
 uniform float max_tex_height;
 
+out vec4 FragColor;
+
 // Number of samples used for blurring
 #define NB_SAMPLES 8
 
@@ -78,8 +80,8 @@ void main()
 		blur_texcoords += inc_vec;
 	}
 	color /= vec3(NB_SAMPLES);
-	gl_FragColor = vec4(color, 1.0);
+	FragColor = vec4(color, 1.0);
 
 	// Keep this commented line for debugging:
-	//gl_FragColor = vec4(blur_factor, blur_factor, blur_factor, 0.0);
+	//FragColor = vec4(blur_factor, blur_factor, blur_factor, 0.0);
 }

data/shaders/multiply.frag

@@ -2,10 +2,12 @@
 uniform sampler2D tex1;
 uniform sampler2D tex2;
 
+out vec4 FragColor;
+
 void main()
 {
 	vec4 col1 = texture(tex1, gl_TexCoord[0].xy);
 	vec4 col2 = vec4(vec3(texture(tex2, gl_TexCoord[0].xy).x), 1.0);
 
-	gl_FragColor = col1 * col2;
+	FragColor = col1 * col2;
 }

data/shaders/normalmap.frag

@@ -4,6 +4,7 @@ uniform sampler2D normalMap;
 noperspective in vec3 tangent;
 noperspective in vec3 bitangent;
 in vec2 uv;
+out vec4 FragColor;
 
 void main()
 {
@@ -17,5 +18,5 @@ void main()
 	vec3 FragmentNormal = TS_normal.x * Frag_tangent + TS_normal.y * Frag_bitangent - TS_normal.z * Frag_normal;
 	FragmentNormal = normalize(FragmentNormal);
 	
-	gl_FragColor = vec4(0.5 * FragmentNormal + 0.5, gl_FragCoord.z);
+	FragColor = vec4(0.5 * FragmentNormal + 0.5, gl_FragCoord.z);
 }

data/shaders/object_pass1.frag

@@ -1,7 +1,8 @@
 #version 130
 noperspective in vec3 nor;
+out vec4 FragColor;
 
 void main(void)
 {
-    gl_FragColor = vec4(0.5 * normalize(nor) + 0.5, gl_FragCoord.z);
+    FragColor = vec4(0.5 * normalize(nor) + 0.5, gl_FragCoord.z);
 }

data/shaders/object_pass2.frag

@@ -6,6 +6,7 @@ uniform sampler2D SSAO;
 uniform vec2 screen;
 uniform vec3 ambient;
 in vec2 uv;
+out vec4 FragColor;
 
 void main(void)
 {
@@ -15,5 +16,5 @@ void main(void)
     vec3 SpecularComponent = texture(SpecularMap, tc).xyz;
 	float ao = texture(SSAO, tc).x;
     vec3 LightFactor = ao * ambient + DiffuseComponent + SpecularComponent * (1. - color.a);
-    gl_FragColor = vec4(color.xyz * LightFactor, 1.);
+    FragColor = vec4(color.xyz * LightFactor, 1.);
 }

data/shaders/objectpass.frag

@@ -8,6 +8,9 @@ noperspective in vec3 nor;
 in vec4 color;
 in vec2 uv0;
 in vec2 uv1;
+out vec4 Albedo;
+out vec4 NormalDepth;
+out vec4 Specular;
 
 void main() {
 	vec4 light = vec4(1.0);
@@ -22,8 +25,8 @@ void main() {
 	else
 		col = color;
 
-	gl_FragData[0] = vec4(col.xyz, 1.);
-	gl_FragData[1] = vec4(0.5 * normalize(nor) + 0.5, gl_FragCoord.z);
-	gl_FragData[2] = vec4(1. - col.a);
+	Albedo = vec4(col.xyz, 1.);
+	NormalDepth = vec4(0.5 * normalize(nor) + 0.5, gl_FragCoord.z);
+	Specular = vec4(1. - col.a);
 }
 

data/shaders/objectpass_ref.frag

@@ -6,6 +6,9 @@ uniform float objectid;
 noperspective in vec3 nor;
 in vec2 uv0;
 in vec2 uv1;
+out vec4 Albedo;
+out vec4 NormalDepth;
+out vec4 Specular;
 
 void main() {
 
@@ -15,12 +18,12 @@ void main() {
 		if (col.a < 0.5)
 			discard;
 
-		gl_FragData[0] = vec4(col.xyz, 1.);
+		Albedo = vec4(col.xyz, 1.);
 	//} else {
-	//	gl_FragData[0] = gl_Color;
+	//	Albedo = gl_Color;
 	//}
 
-	gl_FragData[1] = vec4(0.5 * normalize(nor) + 0.5, gl_FragCoord.z);
-	gl_FragData[2] = vec4(1. - col.a);
+	NormalDepth = vec4(0.5 * normalize(nor) + 0.5, gl_FragCoord.z);
+	Specular = vec4(1. - col.a);
 }
 

data/shaders/objectpass_rimlit.frag

@@ -6,6 +6,9 @@ uniform float objectid;
 noperspective in vec3 nor;
 noperspective in vec3 eyenor;
 noperspective in vec3 viewpos;
+out vec4 Albedo;
+out vec4 NormalDepth;
+out vec4 Specular;
 
 void main() {
 	float rim = 1.0 - dot(eyenor, viewpos);
@@ -25,8 +28,8 @@ void main() {
 		color = gl_Color + vec4(vec3(rim), 0.0);
 	}
 
-	gl_FragData[0] = vec4(color.xyz, 1.);
-	gl_FragData[1] = vec4(0.5 * normalize(nor) + 0.5, gl_FragCoord.z);
-	gl_FragData[2] = vec4(1. - color.a);
+	Albedo = vec4(color.xyz, 1.);
+	NormalDepth = vec4(0.5 * normalize(nor) + 0.5, gl_FragCoord.z);
+	Specular = vec4(1. - color.a);
 }
 

data/shaders/objectpass_spheremap.frag

@@ -2,6 +2,7 @@
 uniform sampler2D tex;
 
 noperspective in vec3 nor;
+out vec4 FragColor;
 
 void main() {
 	// Calculate the spherical UV
@@ -17,5 +18,5 @@ void main() {
 
 	vec4 detail0 = texture(tex, 0.5 * vec2(sin_theta_x, sin_theta_y) + 0.5);
 
-	gl_FragColor = vec4(detail0.xyz, 1.);
+	FragColor = vec4(detail0.xyz, 1.);
 }

data/shaders/objectref_pass1.frag

@@ -3,11 +3,12 @@ uniform sampler2D tex;
 
 noperspective in vec3 nor;
 in vec2 uv;
+out vec4 NormalDepth;
 
 void main() {
 	vec4 col = texture(tex, uv);
 	if (col.a < 0.5)
 		discard;
-	gl_FragColor = vec4(0.5 * normalize(nor) + 0.5, gl_FragCoord.z);
+	NormalDepth = vec4(0.5 * normalize(nor) + 0.5, gl_FragCoord.z);
 }
 

data/shaders/objectref_pass2.frag

@@ -6,6 +6,7 @@ uniform sampler2D SSAO;
 uniform vec2 screen;
 uniform vec3 ambient;
 in vec2 uv;
+out vec4 FragColor;
 
 void main(void)
 {
@@ -16,5 +17,5 @@ void main(void)
     vec3 SpecularComponent = texture(SpecularMap, tc).xyz;
     float ao = texture(SSAO, tc).x;
     vec3 LightFactor = ao * ambient + DiffuseComponent + SpecularComponent;
-    gl_FragColor = vec4(color.xyz * LightFactor, 1.);
+    FragColor = vec4(color.xyz * LightFactor, 1.);
 }

data/shaders/pass.frag

@@ -1,7 +1,9 @@
 #version 130
 uniform sampler2D tex;
 
+out vec4 FragColor;
+
 void main()
 {
-	gl_FragColor = texture(tex, gl_TexCoord[0].xy);
+	FragColor = texture(tex, gl_TexCoord[0].xy);
 }

data/shaders/penumbrah.frag

@@ -2,6 +2,7 @@
 uniform sampler2D tex;
 uniform vec2 pixel;
 
+out vec4 FragColor;
 // Separated penumbra, horizontal
 
 void main()
@@ -49,5 +50,5 @@ void main()
 	width += tmp.y;
 
 	float hasz = step(0.7, zsum);
-	gl_FragColor = vec4(sum, (width / zsum) * hasz, hasz, 1.0);
+	FragColor = vec4(sum, (width / zsum) * hasz, hasz, 1.0);
 }

data/shaders/penumbrav.frag

@@ -2,6 +2,8 @@
 uniform sampler2D tex;
 uniform vec2 pixel;
 
+out vec4 FragColor;
+
 // Separated penumbra, vertical
 
 void main()
@@ -49,5 +51,5 @@ void main()
 	width += tmp.y;
 
 	float hasz = step(0.7, zsum);
-	gl_FragColor = vec4(sum, (width / zsum) * hasz, hasz, 1.0);
+	FragColor = vec4(sum, (width / zsum) * hasz, hasz, 1.0);
 }

data/shaders/pointlight.frag

@@ -9,6 +9,8 @@ uniform mat4 invproj;
 uniform mat4 viewm;
 
 in vec2 uv;
+out vec4 Diffuse;
+out vec4 Specular;
 
 void main() {
 	vec2 texc = uv;
@@ -44,6 +46,6 @@ void main() {
 		specular += Specular * light_col * spec_att;
 	}
 
-	gl_FragData[0] = vec4(diffuse, 1.);
-	gl_FragData[1] = vec4(specular , 1.);
+	Diffuse = vec4(diffuse, 1.);
+	Specular = vec4(specular , 1.);
 }

data/shaders/ppdisplace.frag

@@ -5,6 +5,7 @@ uniform sampler2D dtex;
 uniform int viz;
 
 in vec2 uv;
+out vec4 FragColor;
 
 void main()
 {
@@ -21,9 +22,9 @@ void main()
 
 	if (viz < 1)
 	{
-		gl_FragColor = newcol;
+		FragColor = newcol;
 	} else
 	{
-		gl_FragColor = shiftval * vec4(50.0);
+		FragColor = shiftval * vec4(50.0);
 	}
 }

data/shaders/rain.frag

@@ -4,6 +4,8 @@ uniform sampler2D normals_and_depth;
 uniform mat4 invproj;
 uniform vec2 screen;
 
+out vec4 FragColor;
+
 void main()
 {
 	vec2 xy = gl_FragCoord.xy / screen;
@@ -15,6 +17,6 @@ void main()
 	EnvPos /= EnvPos.w;
 	float len = dot(vec3(1.0), abs(texture(normals_and_depth, xy).xyz));
 	float alpha = (len < 0.2) ? 1. : clamp((EnvPos.z - FragmentPos.z) * 0.3, 0., 1.);
-	gl_FragColor = texture(tex, gl_PointCoord.xy);
-	gl_FragColor.a *= alpha;
+	FragColor = texture(tex, gl_PointCoord.xy);
+	FragColor.a *= alpha;
 }

data/shaders/shadowgen.frag

@@ -2,6 +2,7 @@
 uniform sampler2D halft; // half is a reserved word
 uniform sampler2D quarter;
 uniform sampler2D eighth;
+out vec4 FragColor;
 
 void main()
 {
@@ -41,5 +42,5 @@ void main()
 		outval = 1.0 - mix(val[down].x, val[up].x, interp);
 	}
 
-	gl_FragColor = vec4(vec3(outval), 1.0);
+	FragColor = vec4(vec3(outval), 1.0);
 }

data/shaders/shadowimportance.frag

@@ -6,6 +6,7 @@ uniform int low;
 
 in vec3 wpos;
 in vec2 texc;
+out vec4 FragColor;
 
 float luminanceImp()
 {
@@ -66,6 +67,6 @@ void main()
 	importance = ceil(importance) * low;
 	importance /= steps;
 
-	gl_FragColor = vec4(importance);
+	FragColor = vec4(importance);
 	gl_FragDepth = 1.0 - importance;
 }

data/shaders/shadowpass.frag

@@ -6,6 +6,7 @@ uniform int wireframe;
 uniform float objectid;
 
 in vec2 uv;
+out vec4 FragColor;
 
 vec4 encdepth(float v) {
 	vec4 enc = vec4(1.0, 255.0, 65025.0, 16581375.0) * v;
@@ -25,13 +26,13 @@ void main() {
 
 	if (viz < 1)
 	{
-		gl_FragColor = vec4(encdepth(gl_FragCoord.z).xyz, objectid);
+		FragColor = vec4(encdepth(gl_FragCoord.z).xyz, objectid);
 	}
 	else {
 		if (wireframe > 0)
-			gl_FragColor = vec4(1.0);
+			FragColor = vec4(1.0);
 		else
-			gl_FragColor = texture(tex, uv);
+			FragColor = texture(tex, uv);
 	}
 }
 

data/shaders/shadowwarph.frag

@@ -3,6 +3,8 @@ uniform sampler2D tex;
 uniform int size;
 uniform vec2 pixel;
 
+out vec4 FragColor;
+
 vec4 encdepth(float v) {
 	vec4 enc = vec4(1.0, 255.0, 65025.0, 16581375.0) * v;
 	enc = fract(enc);
@@ -51,5 +53,5 @@ void main()
 	res = res * 0.5 + 0.5;
 	res = clamp(res, 0.01, 0.99);
 
-	gl_FragColor = encdepth(res);
+	FragColor = encdepth(res);
 }

data/shaders/shadowwarpv.frag

@@ -3,6 +3,8 @@ uniform sampler2D tex;
 uniform int size;
 uniform vec2 pixel;
 
+out vec4 FragColor;
+
 vec4 encdepth(float v) {
 	vec4 enc = vec4(1.0, 255.0, 65025.0, 16581375.0) * v;
 	enc = fract(enc);
@@ -51,5 +53,5 @@ void main()
 	res = res * 0.5 + 0.5;
 	res = clamp(res, 0.01, 0.99);
 
-	gl_FragColor = encdepth(res);
+	FragColor = encdepth(res);
 }

data/shaders/skybox.frag

@@ -25,6 +25,7 @@ in vec2 uv;
 in vec2 uv_cl;
 in vec3 vertex;
 in vec2 uv_fast;
+out vec4 FragColor;
 
 void main()
 {
@@ -62,8 +63,8 @@ void main()
 	col = cld_mask + col*(1. - cld_mask);
 	col = cld_fast + col*(1. - cld_fast);
 	
-  gl_FragColor = vec4( vec3(col * paint * paint2), 1.0);
+  FragColor = vec4( vec3(col * paint * paint2), 1.0);
   
 
-  //gl_FragColor = vec4(vec3(ou), 1.0);
+  //FragColor = vec4(vec3(ou), 1.0);
 }

data/shaders/splatting.frag

@@ -12,6 +12,7 @@ uniform vec3 ambient;
 
 in vec2 uv;
 in vec2 uv_bis;
+out vec4 FragColor;
 
 void main() {
 	// Splatting part
@@ -33,7 +34,5 @@ void main() {
   float ao = texture(SSAO, tc).x;
    vec3 LightFactor = ao * ambient + DiffuseComponent + SpecularComponent;
 	
-	gl_FragColor = vec4(splatted.xyz * LightFactor, 1.);
-
-//	gl_FragData[2] = vec4(1. - splatted.a);
+	FragColor = vec4(splatted.xyz * LightFactor, 1.);
 }

data/shaders/ssao.frag

@@ -6,6 +6,7 @@ uniform mat4 projm;
 uniform vec4 samplePoints[16];
 
 in vec2 uv;
+out vec4 FragColor;
 
 const float strengh = 4.;
 const float radius = .4f;
@@ -62,5 +63,5 @@ void main(void)
 	// output the result
 	float ao = 1.0 - bl * invSamples;
 
-	gl_FragColor = vec4(ao);
+	FragColor = vec4(ao);
 }

data/shaders/sunlight.frag

@@ -9,6 +9,10 @@ uniform mat4 invproj;
 uniform int hasclouds;
 uniform vec2 wind;
 
+out vec4 Diff;
+out vec4 Spec;
+out vec4 SpecularMap;
+
 void main() {
 
 	vec2 texc = gl_FragCoord.xy / screen;
@@ -20,8 +24,8 @@ void main() {
 	if (z < 0.03)
 	{
 		// Skyboxes are fully lit
-		gl_FragData[0] = vec4(1.0);
-		gl_FragData[1] = vec4(1.0);
+		Diff = vec4(1.0);
+		Spec = vec4(1.0);
 		return;
 	}
 
@@ -47,7 +51,7 @@ void main() {
 		outcol *= cloud;
 	}
 
-	gl_FragData[0] = vec4(NdotL * col, 1.);
-	gl_FragData[1] = vec4(Specular * col, 1.);
-	gl_FragData[2] = vec4(1.0);
+	Diff = vec4(NdotL * col, 1.);
+	Spec = vec4(Specular * col, 1.);
+	SpecularMap = vec4(1.0);
 }

data/shaders/sunlightshadow.frag

@@ -15,6 +15,9 @@ uniform int hasclouds;
 uniform vec2 wind;
 uniform float shadowoffset;
 
+out vec4 FragColor;
+out vec4 OtherOutput;
+
 float decdepth(vec4 rgba) {
 	return dot(rgba, vec4(1.0, 1.0/255.0, 1.0/65025.0, 1.0/16581375.0));
 }
@@ -28,8 +31,8 @@ void main() {
 	if (z < 0.03)
 	{
 		// Skyboxes are fully lit
-		gl_FragData[0] = vec4(1.0);
-		gl_FragData[1] = vec4(0.0);
+		FragColor = vec4(1.0);
+		OtherOutput = vec4(0.0);
 		return;
 	}
 
@@ -115,6 +118,6 @@ void main() {
 /*	outcol.r = (shadowcoord.z - shadowmapz) * 50.0;
 	outcol.g = moved;*/
 
-	gl_FragData[0] = vec4(outcol, 0.05);
-	gl_FragData[1] = vec4(shadowed, penumbra, shadowed, shadowed);
+	FragColor = vec4(outcol, 0.05);
+	OtherOutput = vec4(shadowed, penumbra, shadowed, shadowed);
 }

data/shaders/texturedquad.frag

@@ -2,8 +2,9 @@
 uniform sampler2D tex;
 
 in vec2 uv;
+out vec4 FragColor;
 
 void main()
 {
-	gl_FragColor = texture(tex, uv);
+	FragColor = texture(tex, uv);
 }

data/shaders/water.frag

@@ -12,6 +12,7 @@ noperspective in vec3 lightVec;
 noperspective in vec3 halfVec;
 noperspective in vec3 eyeVec;
 in vec2 uv;
+out vec4 FragColor;
 
 void main()
 {
@@ -53,5 +54,5 @@ void main()
 	float summed = dot(vec3(1.0), col) / 3.0;
 	float alpha = 0.9 + 0.1 * smoothstep(0.0, 1.0, summed);
 
-	gl_FragColor = vec4(col, alpha);
+	FragColor = vec4(col, alpha);
 }

data/shaders/white.frag

@@ -1,5 +1,6 @@
 #version 130
+out vec4 FragColor;
 void main()
 {
-	gl_FragColor = vec4(1.0);
+	FragColor = vec4(1.0);
 }