Merge brightness and subpixels passes in custom LCD shader

res/shaders/customLCD.shader/ags001-light.fs

@@ -1,9 +1,9 @@
 varying vec2 texCoord;
 uniform sampler2D tex;
+uniform int enable;
 uniform float reflectionBrightness;
 uniform vec2 reflectionDistance;
 uniform float lightBrightness;
-uniform int enable;
 
 const float speed = 2.0;
 const float decay = 2.0;

res/shaders/customLCD.shader/customLCD-brightness.fs

@@ -1,9 +0,0 @@
-varying vec2 texCoord;
-uniform sampler2D tex;
-uniform float brightness;
-
-void main() {
-	vec4 color = texture2D(tex, texCoord);
-	color.rgb *= brightness;
-	gl_FragColor = color;
-}

res/shaders/customLCD.shader/customLCD-subPixels.fs

@@ -1,6 +1,7 @@
 varying vec2 texCoord;
 uniform sampler2D tex;
 uniform vec2 texSize;
+uniform float brightness;
 uniform float subPixelDimming;
 
 void main() {
@@ -10,6 +11,7 @@ void main() {
 	subPixels[0] = vec3(1.0, subPixelDimming, subPixelDimming);
 	subPixels[1] = vec3(subPixelDimming, 1.0, subPixelDimming);
 	subPixels[2] = vec3(subPixelDimming, subPixelDimming, 1.0);
+	color.rgb *= brightness;
 	color.rgb *= subPixels[int(mod(texCoord.s * texSize.x * 3.0, 3.0))];
 	gl_FragColor = color;
 }	

res/shaders/customLCD.shader/manifest.ini

@@ -2,63 +2,57 @@
 name=Custom LCD
 author=endrift, Dominus Iniquitatis, EddyHg80
 description=Configurable LCD emulation.
-passes=4
+passes=3
 
 [pass.0]
-fragmentShader=customLCD-brightness.fs
+fragmentShader=customLCD-subPixels.fs
 blend=1
-width=-1
+width=-3
-height=-1
+height=-3
 
 [pass.0.uniform.brightness]
 type=float
 default=1.1
 readableName=Brightness
 
-[pass.1]
+[pass.0.uniform.subPixelDimming]
-fragmentShader=customLCD-subPixels.fs
-blend=1
-width=-3
-height=-3
-
-[pass.1.uniform.subPixelDimming]
 type=float
 default=0.2
 readableName=Sub pixel dimming
 
-[pass.2]
+[pass.1]
 fragmentShader=customLCD-pixelBounds.fs
 blend=1
 width=-6
 height=-6
 
-[pass.2.uniform.boundBrightness]
+[pass.1.uniform.boundBrightness]
 type=float
 default=0.9
 readableName=Pixel bound brightness
 
-[pass.3]
+[pass.2]
 fragmentShader=ags001-light.fs
 blend=1
 width=-6
 height=-6
 
-[pass.3.uniform.enable]
+[pass.2.uniform.enable]
 type=int
 default=0
 readableName=Enable AGS-001's pristine light and reflections
 
-[pass.3.uniform.lightBrightness]
+[pass.2.uniform.lightBrightness]
 type=float
 default=0.9
 readableName=Light brightness
 
-[pass.3.uniform.reflectionBrightness]
+[pass.2.uniform.reflectionBrightness]
 type=float
 default=0.07
 readableName=Reflection brightness
 
-[pass.3.uniform.reflectionDistance]
+[pass.2.uniform.reflectionDistance]
 type=float2
 default[0]=0
 default[1]=0.025