make all shaders output vec4, not vec3

Author: malytomas

data/cage/shaders/effects/bloomApply.glsl

@@ -10,7 +10,7 @@ layout(binding = 1) uniform sampler2D texBloom;
 
 layout(location = 0) uniform int uniLodLevel;
 
-out vec3 outColor;
+out vec4 outColor;
 
 void main()
 {
@@ -19,5 +19,5 @@ void main()
 	vec2 uv = vec2(gl_FragCoord) / textureSize(texColor, 0).xy;
 	for (int i = 0; i < uniLodLevel; i++)
 		bloom += textureLod(texBloom, uv, i).rgb;
-	outColor = color + bloom / uniLodLevel; // additive mixing
+	outColor = vec4(color + bloom / uniLodLevel, 1); // additive mixing
 }

data/cage/shaders/effects/bloomGenerate.glsl

@@ -9,7 +9,7 @@ layout(location = 0) uniform vec4 uniBloomParams; // threshold
 
 layout(binding = 0) uniform sampler2D texColor;
 
-out vec3 outBloom;
+out vec4 outBloom;
 
 const int downscale = 3;
 
@@ -32,7 +32,7 @@ void main()
 		}
 	}
 	if (cnt > 0)
-		outBloom = acc / float(cnt);
+		outBloom = vec4(acc / float(cnt), 1);
 	else
-		outBloom = vec3(0.0);
+		outBloom = vec4(0, 0, 0, 1);
 }

data/cage/shaders/effects/dofApply.glsl

@@ -38,7 +38,7 @@ layout(binding = 0) uniform sampler2D texColor;
 layout(binding = 1) uniform sampler2D texDepth;
 layout(binding = 2) uniform sampler2D texDof;
 
-out vec3 outColor;
+out vec4 outColor;
 
 void main()
 {
@@ -48,12 +48,12 @@ void main()
 	float depth = texelFetch(texDepth, ivec2(gl_FragCoord), 0).x;
 	if (depth > 1 - 1e-7)
 	{ // skybox
-		outColor = color;
+		outColor = vec4(color, 1);
 		return;
 	}
 	vec3 colorDof = textureLod(texDof, uv, 0).rgb;
 	float near;
 	float far;
 	dofContribution(uv, depth, near, far);
-	outColor = color * (1 - near - far) + colorDof * (near + far);
+	outColor = vec4(color * (1 - near - far) + colorDof * (near + far), 1);
 }

data/cage/shaders/effects/dofCollect.glsl

@@ -7,7 +7,7 @@ $define shader fragment
 
 layout(binding = 0) uniform sampler2D texColor;
 
-out vec3 outDof;
+out vec4 outDof;
 
 const int downscale = 3;
 
@@ -21,5 +21,5 @@ void main()
 		for (int x = 0; x < downscale; x++)
 			color += texelFetch(texColor, ivec2(gl_FragCoord) * downscale + ivec2(x, y) - downscale / 2, 0).rgb;
 	color /= float(downscale * downscale);
-	outDof = color;
+	outDof = vec4(color, 1);
 }

data/cage/shaders/effects/fxaa.glsl

@@ -12,21 +12,16 @@ layout(binding = 0) uniform sampler2D texColor;
 out vec4 outColor;
 
 const float lumaThreshold = 0.5;
-const float mulReduce = 1.0 / 8.0;
-const float minReduce = 1.0 / 128.0;
-const float maxSpan = 8.0;
+const float mulReduce = 1 / 8.0;
+const float minReduce = 1 / 128.0;
+const float maxSpan = 8;
 const vec3 toLuma = vec3(0.299, 0.587, 0.114);
 
 void main()
 {
-	vec2 texelStep = 1.0 / vec2(textureSize(texColor, 0));
+	vec2 texelStep = 1 / vec2(textureSize(texColor, 0));
 	vec2 uv = gl_FragCoord.xy * texelStep;
 	vec3 rgbM = textureLod(texColor, uv, 0).rgb;
-	if (false)
-	{
-		outColor = vec4(rgbM, 1.0);
-		return;
-	}
 
 	vec3 rgbNW = textureLodOffset(texColor, uv, 0, ivec2(-1, 1)).rgb;
 	vec3 rgbNE = textureLodOffset(texColor, uv, 0, ivec2(1, 1)).rgb;
@@ -41,28 +36,25 @@ void main()
 	float lumaMax = max(lumaM, max(max(lumaNW, lumaNE), max(lumaSW, lumaSE)));
 	if (lumaMax - lumaMin <= lumaMax * lumaThreshold)
 	{
-		outColor = vec4(rgbM, 1.0);
+		outColor = vec4(rgbM, 1);
 		return;
 	}
 
 	vec2 samplingDirection;
 	samplingDirection.x = -((lumaNW + lumaNE) - (lumaSW + lumaSE));
 	samplingDirection.y =  ((lumaNW + lumaSW) - (lumaNE + lumaSE));
 	float samplingDirectionReduce = max((lumaNW + lumaNE + lumaSW + lumaSE) * 0.25 * mulReduce, minReduce);
-	float minSamplingDirectionFactor = 1.0 / (min(abs(samplingDirection.x), abs(samplingDirection.y)) + samplingDirectionReduce);
+	float minSamplingDirectionFactor = 1 / (min(abs(samplingDirection.x), abs(samplingDirection.y)) + samplingDirectionReduce);
 	samplingDirection = clamp(samplingDirection * minSamplingDirectionFactor, vec2(-maxSpan), vec2(maxSpan)) * texelStep;
-	vec3 rgbSampleNeg = textureLod(texColor, uv + samplingDirection * (1.0/3.0 - 0.5), 0).rgb;
-	vec3 rgbSamplePos = textureLod(texColor, uv + samplingDirection * (2.0/3.0 - 0.5), 0).rgb;
+	vec3 rgbSampleNeg = textureLod(texColor, uv + samplingDirection * (1/3.0 - 0.5), 0).rgb;
+	vec3 rgbSamplePos = textureLod(texColor, uv + samplingDirection * (2/3.0 - 0.5), 0).rgb;
 	vec3 rgbTwoTab = (rgbSamplePos + rgbSampleNeg) * 0.5;
-	vec3 rgbSampleNegOuter = textureLod(texColor, uv + samplingDirection * (0.0/3.0 - 0.5), 0).rgb;
-	vec3 rgbSamplePosOuter = textureLod(texColor, uv + samplingDirection * (3.0/3.0 - 0.5), 0).rgb;
+	vec3 rgbSampleNegOuter = textureLod(texColor, uv + samplingDirection * (0/3.0 - 0.5), 0).rgb;
+	vec3 rgbSamplePosOuter = textureLod(texColor, uv + samplingDirection * (3/3.0 - 0.5), 0).rgb;
 	vec3 rgbFourTab = (rgbSamplePosOuter + rgbSampleNegOuter) * 0.25 + rgbTwoTab * 0.5;
 	float lumaFourTab = dot(rgbFourTab, toLuma);
 	if (lumaFourTab < lumaMin || lumaFourTab > lumaMax)
-		outColor = vec4(rgbTwoTab, 1.0);
+		outColor = vec4(rgbTwoTab, 1);
 	else
-		outColor = vec4(rgbFourTab, 1.0);
-
-	if (false)
-		outColor.r = 1.0;
+		outColor = vec4(rgbFourTab, 1);
 }

data/cage/shaders/effects/gaussianBlur.glsl

@@ -19,7 +19,7 @@ layout(location = 1) uniform int uniLodLevel;
 
 void main()
 {
-	vec2 texelSize = 1.0 / textureSize(texInput, uniLodLevel).xy;
+	vec2 texelSize = 1 / vec2(textureSize(texInput, uniLodLevel));
 	vec2 center = gl_FragCoord.xy;
 	vec4 val = textureLod(texInput, center * texelSize, uniLodLevel) * weights[0];
 	for(int i = 1; i < 3; i++)

data/cage/shaders/effects/sharpening.glsl

@@ -12,7 +12,7 @@ layout(std140, binding = CAGE_SHADER_UNIBLOCK_CUSTOMDATA) uniform Sharpening
 	vec4 params; // strength
 };
 
-out vec3 outColor;
+out vec4 outColor;
 
 void main()
 {
@@ -24,5 +24,5 @@ void main()
 	vec3 right = texelFetch(texColor, coord + ivec2(1, 0), 0).rgb;
 	float strength = params.x;
 	vec3 sharpenedColor = center * (1 + 4 * strength) - (up + down + left + right) * strength;
-	outColor = clamp(sharpenedColor, 0, 1);
+	outColor = vec4(clamp(sharpenedColor, 0, 1), 1);
 }

data/cage/shaders/effects/tonemap.glsl

@@ -12,7 +12,7 @@ layout(std140, binding = CAGE_SHADER_UNIBLOCK_CUSTOMDATA) uniform Tonemap
 	vec4 params; // gamma, tonemapEnabled
 };
 
-out vec3 outColor;
+out vec4 outColor;
 
 // https://github.com/KhronosGroup/ToneMapping/blob/main/PBR_Neutral/pbrNeutral.glsl
 vec3 neutralToneMapping(vec3 color)
@@ -42,5 +42,5 @@ void main()
 	// gamma correction
 	color = pow(color, vec3(params[0]));
 
-	outColor = color;
+	outColor = vec4(color, 1);
 }