[WWHD] GC colour replaced by contrasty

GC colour setting will be added, need to sort out local WIP and merge
first

Enhancements/WindWakerHD_Contrasty/ff71dcd2ad4defdc_00000000000003c9_ps.txt

@@ -2,16 +2,81 @@
 #extension GL_ARB_texture_gather : enable
 // shader ff71dcd2ad4defdc
 //AA ps
-const float resScale = 2.0;
 
-//old contrasty, or just copy paste clarity
-const float gamma = 0.85; // 1.0 is neutral  Botw is already colour graded at this stage
-const float exposure = 1.02; // 1.0 is neutral
-const float vibrance = 0.0175;  // 0.0 is neutral  
-const float crushContrast = 0.00; // 0.0 is neutral. Use small increments, loss of shadow detail 
+uniform vec2 uf_fragCoordScale;
+
+const float hazeFactor = 0.1;
+
+const float gamma = $gamma; // 1.0 is neutral  Botw is already colour graded at this stage
+const float exposure = $exposure; // 1.0 is neutral
+const float vibrance = $vibrance;  // 0.0 is neutral  
+const float crushContrast = $crushContrast; // 0.0 is neutral. Use small increments, loss of shadow detail 
+const float contrastCurve = $contrastCurve;
+
+
+vec3 RGB_Lift = vec3($redShadows, $greenShadows , $blueSadows);		// [0.000 to 2.000] Adjust shadows for Red, Green and Blue.
+vec3 RGB_Gamma = vec3($redMid ,$greenMid, $blueMid);				// [0.000 to 2.000] Adjust midtones for Red, Green and Blue
+vec3 RGB_Gain = vec3($redHilight, $greenHilight, $blueHilight);		// [0.000 to 2.000] Adjust highlights for Red, Green and Blue
+//lumasharpen
+const float sharp_mix = $sharp_mix;
+const float sharp_strength = 2.0; 
+const float sharp_clamp = 0.75;
+const float offset_bias = 1.0;
+float Sigmoid (float x) {
+
+	return 1.0 / (1.0 + (exp(-(x - 0.5) * 5.5))); 
+}
+
+
+#define px (1.0/1920.0*uf_fragCoordScale.x)
+#define py (1.0/1080.0*uf_fragCoordScale.y)
+#define CoefLuma vec3(0.2126, 0.7152, 0.0722)  
+
+float lumasharping(sampler2D tex, vec2 pos) {
+	vec4 colorInput = texture(tex, pos);
+
+	vec3 ori = colorInput.rgb;
+
+	// -- Combining the strength and luma multipliers --
+	vec3 sharp_strength_luma = (CoefLuma * sharp_strength);
+
+	// -- Gaussian filter --
+	//   [ .25, .50, .25]     [ 1 , 2 , 1 ]
+	//   [ .50,   1, .50]  =  [ 2 , 4 , 2 ]
+	//   [ .25, .50, .25]     [ 1 , 2 , 1 ]
+
+	vec3 blur_ori = texture(tex, pos + vec2(px, -py) * 0.5 * offset_bias).rgb; // South East
+	blur_ori += texture(tex, pos + vec2(-px, -py) * 0.5 * offset_bias).rgb;  // South West
+	blur_ori += texture(tex, pos + vec2(px, py) * 0.5 * offset_bias).rgb; // North East
+	blur_ori += texture(tex, pos + vec2(-px, py) * 0.5 * offset_bias).rgb; // North West
+
+	blur_ori *= 0.25;  // ( /= 4) Divide by the number of texture fetches
+
+	// -- Calculate the sharpening --
+	vec3 sharp = ori - blur_ori;  //Subtracting the blurred image from the original image
+
+	// -- Adjust strength of the sharpening and clamp it--
+	vec4 sharp_strength_luma_clamp = vec4(sharp_strength_luma * (0.5 / sharp_clamp), 0.5); //Roll part of the clamp into the dot
+
+	float sharp_luma = clamp((dot(vec4(sharp, 1.0), sharp_strength_luma_clamp)), 0.0, 1.0); //Calculate the luma, adjust the strength, scale up and clamp
+	sharp_luma = (sharp_clamp * 2.0) * sharp_luma - sharp_clamp; //scale down
+
+	return sharp_luma;
+}
+
+vec3 LiftGammaGainPass(vec3 colorInput)
+{ 	//reshade BSD https://reshade.me ,  Alexkiri port
+	vec3 color = colorInput;
+	color = color * (1.5 - 0.5 * RGB_Lift) + 0.5 * RGB_Lift - 0.5;
+	color = clamp(color, 0.0, 1.0); 
+	color *= RGB_Gain;	
+	color = pow(color, 1.0 / RGB_Gamma);
+	return clamp(color, 0.0, 1.0);
+}
 
 vec3 contrasty(vec3 colour){
 	vec3 fColour = (colour.xyz);
+	//fColour = LiftGammaGainPass(fColour);
 	
 	fColour = clamp(exposure * fColour, 0.0, 1.0);
 	fColour = pow(fColour, vec3(1.0 / gamma));
@@ -20,18 +85,21 @@ vec3 contrasty(vec3 colour){
 	float mx = max(max(fColour.r, fColour.g), fColour.b);
 	float sat = (1.0 - (mx - mn)) * (1.0 - mx) * luminance * 5.0;
 	vec3 lightness = vec3((mn + mx) / 2.0);
-// vibrance
+	fColour = LiftGammaGainPass(fColour);
+	// vibrance
 	fColour = mix(fColour, mix(fColour, lightness, -vibrance), sat);
 	fColour = max(vec3(0.0), fColour - vec3(crushContrast));
 	return fColour;
 }
 
+
+const float resScale = 2.0;
 uniform ivec4 uf_remappedPS[4];
 layout(binding = 0) uniform sampler2D textureUnitPS0;// Tex0 addr 0xf5807800 res 1920x1080x1 dim 1 tm: 4 format 0019 compSel: 0 1 2 3 mipView: 0x0 (num 0x1) sliceView: 0x0 (num 0x1) Sampler0 ClampX/Y/Z: 2 2 2 border: 1
 layout(binding = 1) uniform sampler2D textureUnitPS1;// Tex1 addr 0xf4000800 res 1920x1080x1 dim 1 tm: 4 format 0001 compSel: 0 4 4 5 mipView: 0x0 (num 0x1) sliceView: 0x0 (num 0x1) Sampler1 ClampX/Y/Z: 2 2 2 border: 1
 layout(location = 0) in vec4 passParameterSem2;
 layout(location = 0) out vec4 passPixelColor0;
-uniform vec2 uf_fragCoordScale;
+//uniform vec2 uf_fragCoordScale;
 int clampFI32(int v)
 {
 if( v == 0x7FFFFFFF )
@@ -211,5 +279,10 @@ activeMaskStackC[1] = activeMaskStack[0] == true && activeMaskStackC[0] == true;
 // export
 
 R2f.xyz = contrasty(R2f.xyz);
+R2f.xyz = mix(R2f.xyz, smoothstep(0.0, 1.0, R2f.xyz), contrastCurve);
+float smask = lumasharping(textureUnitPS1, passParameterSem2.xy);
+vec3 temp3 = R2f.xyz;
+R2f.xyz = mix(R2f.xyz, (temp3.xyz += (smask)), sharp_mix);
+
 passPixelColor0 = vec4(R2f.x, R2f.y, R2f.z, R2f.w);
 }

Enhancements/WindWakerHD_Contrasty/rules.txt

@@ -0,0 +1,160 @@
+[Definition]
+titleIds = 0005000010143400,0005000010143600,0005000010143500
+name = Contrasty
+path = "The Legend of Zelda: The Wind Waker HD/Contrasty" 
+description = Colour and contrast - Replaces AA fix
+version = 3
+
+[Preset]
+name = default
+$redShadows = 1.0
+$greenShadows = 1.0
+$blueSadows = 1.0
+$redMid = 1.0
+$greenMid = 1.0
+$blueMid = 1.0
+$redHilight = 1.0
+$greenHilight =1.0
+$blueHilight = 1.0
+
+$contrastCurve = 0.0
+$hazeFactor = 1.0
+$bloom = 1.0
+$gamma = 1.0
+$exposure = 1.0
+$vibrance = 0.0
+$crushContrast = 0.0
+$bleach = 1.0
+$sharp_mix = 0.0
+
+[Preset]
+name = Some Contrast
+$redShadows = 1.0
+$greenShadows = 0.99
+$blueSadows = 1.0
+$redMid = 1.0
+$greenMid = 0.99
+$blueMid = 1.0
+$redHilight = 0.97
+$greenHilight =0.97
+$blueHilight = 0.97
+
+$contrastCurve = 0.4
+$hazeFactor = 0.25
+$bloom = 0.85
+$gamma = 1.1
+$exposure = 0.975
+$vibrance = 0.05
+$crushContrast = 0.00
+$bleach = 0.85
+$sharp_mix = 0.3
+
+[Preset]
+name = High Contrasty
+$redShadows = 1.0
+$greenShadows = 1.0
+$blueSadows = 1.0
+$redMid = 0.99
+$greenMid = 0.99
+$blueMid = 0.99
+$redHilight = 1.0
+$greenHilight =1.0
+$blueHilight = 1.0
+
+$contrastCurve = 0.4
+$hazeFactor = 0.25
+$bloom = 0.85
+$gamma = 1.12
+$exposure = 1.01
+$vibrance = 0.15
+$crushContrast = 0.00
+$bleach = 0.85
+$sharp_mix = 0.1
+
+[Preset]
+name = Colourfull
+$redShadows = 1.0
+$greenShadows = 1.0
+$blueSadows = 1.0
+$redMid = 0.99
+$greenMid = 0.98
+$blueMid = 0.99
+$redHilight = 1.0
+$greenHilight =0.99
+$blueHilight = 1.0
+
+$contrastCurve = 0.333
+$hazeFactor = 0.25
+$bloom = 0.85
+$gamma = 1.1
+$exposure = 1.01
+$vibrance = 0.35
+$crushContrast = 0.00
+$bleach = 0.85
+$sharp_mix = 0.1
+
+[Preset]
+name = Neutral Contrasty
+$redShadows = 1.01
+$greenShadows = 1.01
+$blueSadows = 1.01
+$redMid = 1.0
+$greenMid = 1.0
+$blueMid = 1.0
+$redHilight = 0.99
+$greenHilight =0.99
+$blueHilight = 0.99
+
+$contrastCurve = 0.25
+$hazeFactor = 1.0
+$bloom = 0.85
+$gamma = 1.05
+$exposure = 1.0
+$vibrance = 0.0
+$crushContrast = 0.00
+$bleach = 0.85
+$sharp_mix = 0.1
+
+[Preset]
+name = Warm
+$redShadows = 1.0
+$greenShadows = 1.0
+$blueSadows = 1.0
+$redMid = 0.98
+$greenMid = 0.98
+$blueMid = 1.0
+$redHilight = 1.0
+$greenHilight =1.0
+$blueHilight = 1.0
+
+$contrastCurve = 0.7
+$hazeFactor = 0.71
+$bloom = 0.85
+$gamma = 1.1
+$exposure = 1.07
+$vibrance = 0.15
+$crushContrast = 0.00
+$bleach = 0.85
+$sharp_mix = 0.25
+
+[Preset]
+name = Cold
+$redShadows = 0.95
+$greenShadows = 0.96
+$blueSadows = 1.03
+$redMid = 0.95
+$greenMid = 0.96
+$blueMid = 1.03
+$redHilight = 0.98
+$greenHilight = 0.99
+$blueHilight = 1.03
+
+$contrastCurve = 0.2
+$hazeFactor = 0.1
+$bloom = 1.0
+$gamma = 1.05
+$exposure = 0.99
+$vibrance = 0.45
+$crushContrast = 0.0
+$bleach = 0.85
+$sharp_mix = 0.35

Enhancements/WindWakerHD_GameCubeColor/rules.txt

@@ -1,6 +0,0 @@
-[Definition]
-titleIds = 0005000010143400,0005000010143600,0005000010143500
-name = "GC colour grading"
-path = "The Legend of Zelda: The Wind Waker HD/Graphics/Colour Tweaks" 
-description = More blue instead of teal, slight contrast increase
-version = 3

Source/WindWakerHD/1f83c0d47b1c4c34_0000000000000000_vs.txt

@@ -0,0 +1,77 @@
+#version 420
+#extension GL_ARB_texture_gather : enable
+#extension GL_ARB_shading_language_packing : enable
+// shader 1f83c0d47b1c4c34 // half res blur. Horizon, detail shadows, bloom base
+
+const float resScale = ($height/$gameHeight)*$internalRes; 
+uniform ivec4 uf_remappedVS[1];
+uniform vec2 uf_windowSpaceToClipSpaceTransform;
+layout(location = 0) in uvec4 attrDataSem0;
+layout(location = 1) in uvec4 attrDataSem1;
+out gl_PerVertex
+{
+	vec4 gl_Position;
+	float gl_PointSize;
+};
+layout(location = 0) out vec4 passParameterSem3;
+int clampFI32(int v)
+{
+if( v == 0x7FFFFFFF )
+	return floatBitsToInt(1.0);
+else if( v == 0xFFFFFFFF )
+	return floatBitsToInt(0.0);
+return floatBitsToInt(clamp(intBitsToFloat(v), 0.0, 1.0));
+}
+float mul_nonIEEE(float a, float b){ if( a == 0.0 || b == 0.0 ) return 0.0; return a*b; }
+void main()
+{
+vec4 R0f = vec4(0.0);
+vec4 R1f = vec4(0.0);
+vec4 R2f = vec4(0.0);
+uvec4 attrDecoder;
+float backupReg0f, backupReg1f, backupReg2f, backupReg3f, backupReg4f;
+vec4 PV0f = vec4(0.0), PV1f = vec4(0.0);
+float PS0f = 0.0, PS1f = 0.0;
+vec4 tempf = vec4(0.0);
+float tempResultf;
+int tempResulti;
+ivec4 ARi = ivec4(0);
+bool predResult = true;
+vec3 cubeMapSTM;
+int cubeMapFaceId;
+R0f = floatBitsToInt(ivec4(gl_VertexID, 0, 0, gl_InstanceID));
+attrDecoder.xyz = attrDataSem0.xyz;
+attrDecoder.xyz = (attrDecoder.xyz>>24)|((attrDecoder.xyz>>8)&0xFF00)|((attrDecoder.xyz<<8)&0xFF0000)|((attrDecoder.xyz<<24));
+attrDecoder.w = 0;
+R1f = vec4(intBitsToFloat(int(attrDecoder.x)), intBitsToFloat(int(attrDecoder.y)), intBitsToFloat(int(attrDecoder.z)), intBitsToFloat(floatBitsToInt(1.0)));
+attrDecoder.xy = attrDataSem1.xy;
+attrDecoder.xy = (attrDecoder.xy>>24)|((attrDecoder.xy>>8)&0xFF00)|((attrDecoder.xy<<8)&0xFF0000)|((attrDecoder.xy<<24));
+attrDecoder.z = 0;
+attrDecoder.w = 0;
+R2f = vec4(intBitsToFloat(int(attrDecoder.x)), intBitsToFloat(int(attrDecoder.y)), intBitsToFloat(floatBitsToInt(0.0)), intBitsToFloat(floatBitsToInt(1.0)));
+// 0
+backupReg0f = R1f.x;
+backupReg1f = R1f.y;
+R1f.x = backupReg0f;
+R1f.x *= 2.0;
+R1f.y = backupReg1f;
+R1f.y *= 2.0;
+R1f.z = intBitsToFloat(0xbf800000);
+R1f.w = 1.0;
+PS0f = R2f.x + -(intBitsToFloat(uf_remappedVS[0].x)/resScale);
+// 1
+backupReg0f = R2f.y;
+backupReg1f = R2f.x;
+PV1f.x = R2f.y + -(intBitsToFloat(uf_remappedVS[0].y) / resScale);
+R2f.y = backupReg0f + intBitsToFloat(uf_remappedVS[0].y) / resScale;
+R2f.z = PS0f;
+R2f.x = backupReg1f + intBitsToFloat(uf_remappedVS[0].x) / resScale;
+PS1f = R2f.x;
+// 2
+R2f.w = PV1f.x;
+// export
+gl_Position = vec4(R1f.x, R1f.y, R1f.z, R1f.w);
+// export
+passParameterSem3 = vec4(R2f.x, R2f.y, R2f.z, R2f.w);
+// 0
+}

Source/WindWakerHD/4c426260188ace42_0000000000000000_vs.txt

@@ -0,0 +1,107 @@
+#version 420
+#extension GL_ARB_texture_gather : enable
+#extension GL_ARB_shading_language_packing : enable
+// shader 4c426260188ace42
+// shadows pyramid blend 2nd downscale 
+
+const float resScale = ($height/$gameHeight)*$internalRes; 
+uniform ivec4 uf_remappedVS[5];
+uniform vec2 uf_windowSpaceToClipSpaceTransform;
+layout(location = 0) in uvec4 attrDataSem0;
+out gl_PerVertex
+{
+	vec4 gl_Position;
+	float gl_PointSize;
+};
+layout(location = 0) out vec4 passParameterSem0;
+int clampFI32(int v)
+{
+if( v == 0x7FFFFFFF )
+	return floatBitsToInt(1.0);
+else if( v == 0xFFFFFFFF )
+	return floatBitsToInt(0.0);
+return floatBitsToInt(clamp(intBitsToFloat(v), 0.0, 1.0));
+}
+float mul_nonIEEE(float a, float b){ if( a == 0.0 || b == 0.0 ) return 0.0; return a*b; }
+void main()
+{
+vec4 R0f = vec4(0.0);
+vec4 R1f = vec4(0.0);
+vec4 R126f = vec4(0.0);
+vec4 R127f = vec4(0.0);
+uvec4 attrDecoder;
+float backupReg0f, backupReg1f, backupReg2f, backupReg3f, backupReg4f;
+vec4 PV0f = vec4(0.0), PV1f = vec4(0.0);
+float PS0f = 0.0, PS1f = 0.0;
+vec4 tempf = vec4(0.0);
+float tempResultf;
+int tempResulti;
+ivec4 ARi = ivec4(0);
+bool predResult = true;
+vec3 cubeMapSTM;
+int cubeMapFaceId;
+R0f = floatBitsToInt(ivec4(gl_VertexID, 0, 0, gl_InstanceID));
+attrDecoder.xyz = attrDataSem0.xyz;
+attrDecoder.xyz = (attrDecoder.xyz>>24)|((attrDecoder.xyz>>8)&0xFF00)|((attrDecoder.xyz<<8)&0xFF0000)|((attrDecoder.xyz<<24));
+attrDecoder.w = 0;
+R1f = vec4(intBitsToFloat(int(attrDecoder.x)), intBitsToFloat(int(attrDecoder.y)), intBitsToFloat(int(attrDecoder.z)), intBitsToFloat(floatBitsToInt(1.0)));
+// 0
+R127f.x = -(R1f.y);
+PV0f.x = R127f.x;
+R127f.y = (R1f.x > 0.0)?1.0:0.0;
+R127f.y /= 2.0;
+R126f.z = (0.0 > R1f.x)?1.0:0.0;
+R126f.z /= 2.0;
+R127f.w = 1.0;
+PV0f.w = R127f.w;
+R126f.x = intBitsToFloat(uf_remappedVS[0].w) * intBitsToFloat(0x3fae8a72)/ resScale;
+PS0f = R126f.x;
+// 1
+R0f.x = dot(vec4(R1f.x,R1f.y,R1f.z,PV0f.w),vec4(intBitsToFloat(uf_remappedVS[1].x),intBitsToFloat(uf_remappedVS[1].y),intBitsToFloat(uf_remappedVS[1].z),intBitsToFloat(uf_remappedVS[1].w)));
+PV1f.x = R0f.x;
+PV1f.y = R0f.x;
+PV1f.z = R0f.x;
+PV1f.w = R0f.x;
+R127f.z = (PV0f.x > 0.0)?1.0:0.0;
+R127f.z /= 2.0;
+PS1f = R127f.z;
+// 2
+tempf.x = dot(vec4(R1f.x,R1f.y,R1f.z,R127f.w),vec4(intBitsToFloat(uf_remappedVS[2].x),intBitsToFloat(uf_remappedVS[2].y),intBitsToFloat(uf_remappedVS[2].z),intBitsToFloat(uf_remappedVS[2].w)));
+PV0f.x = tempf.x;
+PV0f.y = tempf.x;
+PV0f.z = tempf.x;
+PV0f.w = tempf.x;
+R0f.y = tempf.x;
+PS0f = (0.0 > R127f.x)?1.0:0.0;
+PS0f /= 2.0;
+// 3
+backupReg0f = R127f.z;
+tempf.x = dot(vec4(R1f.x,R1f.y,R1f.z,R127f.w),vec4(intBitsToFloat(uf_remappedVS[3].x),intBitsToFloat(uf_remappedVS[3].y),intBitsToFloat(uf_remappedVS[3].z),intBitsToFloat(uf_remappedVS[3].w)));
+PV1f.x = tempf.x;
+PV1f.y = tempf.x;
+PV1f.z = tempf.x;
+PV1f.w = tempf.x;
+R0f.z = tempf.x;
+R127f.z = backupReg0f + -(PS0f);
+PS1f = R127f.z;
+// 4
+tempf.x = dot(vec4(R1f.x,R1f.y,R1f.z,R127f.w),vec4(intBitsToFloat(uf_remappedVS[4].x),intBitsToFloat(uf_remappedVS[4].y),intBitsToFloat(uf_remappedVS[4].z),intBitsToFloat(uf_remappedVS[4].w)));
+PV0f.x = tempf.x;
+PV0f.y = tempf.x;
+PV0f.z = tempf.x;
+PV0f.w = tempf.x;
+R0f.w = tempf.x;
+PS0f = R127f.y + -(R126f.z);
+// 5
+R1f.x = PS0f + 0.5;
+PV1f.y = R127f.z + 0.5;
+// 6
+R1f.y = PV1f.y + -(R126f.x);
+R1f.z = PV1f.y + R126f.x;
+R1f.w = PV1f.y;
+// export
+gl_Position = vec4(R0f.x, R0f.y, R0f.z, R0f.w);
+// export
+passParameterSem0 = vec4(R1f.x, R1f.y, R1f.z, R1f.w);
+// 0
+}

Source/WindWakerHD/842a19b509f8b91a_0000000000000000_vs.txt

@@ -0,0 +1,100 @@
+#version 420
+#extension GL_ARB_texture_gather : enable
+#extension GL_ARB_shading_language_packing : enable
+// shader 842a19b509f8b91a //vert scale bloom
+const float resScale = ($height/$gameHeight)*$internalRes; 
+uniform ivec4 uf_remappedVS[1];
+uniform vec2 uf_windowSpaceToClipSpaceTransform;
+layout(location = 0) in uvec4 attrDataSem0;
+layout(location = 1) in uvec4 attrDataSem1;
+out gl_PerVertex
+{
+	vec4 gl_Position;
+	float gl_PointSize;
+};
+layout(location = 0) out vec4 passParameterSem0;
+layout(location = 1) out vec4 passParameterSem1;
+layout(location = 2) out vec4 passParameterSem2;
+int clampFI32(int v)
+{
+if( v == 0x7FFFFFFF )
+	return floatBitsToInt(1.0);
+else if( v == 0xFFFFFFFF )
+	return floatBitsToInt(0.0);
+return floatBitsToInt(clamp(intBitsToFloat(v), 0.0, 1.0));
+}
+float mul_nonIEEE(float a, float b){ if( a == 0.0 || b == 0.0 ) return 0.0; return a*b; }
+void main()
+{
+vec4 R0f = vec4(0.0);
+vec4 R1f = vec4(0.0);
+vec4 R2f = vec4(0.0);
+vec4 R3f = vec4(0.0);
+vec4 R4f = vec4(0.0);
+vec4 R127f = vec4(0.0);
+uvec4 attrDecoder;
+float backupReg0f, backupReg1f, backupReg2f, backupReg3f, backupReg4f;
+vec4 PV0f = vec4(0.0), PV1f = vec4(0.0);
+float PS0f = 0.0, PS1f = 0.0;
+vec4 tempf = vec4(0.0);
+float tempResultf;
+int tempResulti;
+ivec4 ARi = ivec4(0);
+bool predResult = true;
+vec3 cubeMapSTM;
+int cubeMapFaceId;
+R0f = floatBitsToInt(ivec4(gl_VertexID, 0, 0, gl_InstanceID));
+attrDecoder.xyz = attrDataSem0.xyz;
+attrDecoder.xyz = (attrDecoder.xyz>>24)|((attrDecoder.xyz>>8)&0xFF00)|((attrDecoder.xyz<<8)&0xFF0000)|((attrDecoder.xyz<<24));
+attrDecoder.w = 0;
+R1f = vec4(intBitsToFloat(int(attrDecoder.x)), intBitsToFloat(int(attrDecoder.y)), intBitsToFloat(int(attrDecoder.z)), intBitsToFloat(floatBitsToInt(1.0)));
+attrDecoder.xy = attrDataSem1.xy;
+attrDecoder.xy = (attrDecoder.xy>>24)|((attrDecoder.xy>>8)&0xFF00)|((attrDecoder.xy<<8)&0xFF0000)|((attrDecoder.xy<<24));
+attrDecoder.z = 0;
+attrDecoder.w = 0;
+R2f = vec4(intBitsToFloat(int(attrDecoder.x)), intBitsToFloat(int(attrDecoder.y)), intBitsToFloat(floatBitsToInt(0.0)), intBitsToFloat(floatBitsToInt(1.0)));
+// 0
+backupReg0f = R1f.x;
+backupReg1f = R1f.y;
+R1f.x = backupReg0f;
+R1f.x *= 2.0;
+R1f.y = backupReg1f;
+R1f.y *= 2.0;
+R1f.z = 0.0;
+R1f.w = 1.0;
+PS0f = intBitsToFloat(uf_remappedVS[0].y) * intBitsToFloat(0x3fb13a93)/ resScale;
+// 1
+PV1f.x = intBitsToFloat(uf_remappedVS[0].y) * intBitsToFloat(0x404ec4f0) / resScale;
+R127f.y = intBitsToFloat(uf_remappedVS[0].y) * intBitsToFloat(0x40a275f7);
+R2f.z = R2f.y + PS0f;
+PV1f.z = R2f.z;
+R2f.w = R2f.y;
+PV1f.w = R2f.w;
+R0f.y = R2f.y + -(PS0f);
+PS1f = R0f.y;
+// 2
+R0f.x = R2f.x;
+R3f.y = R2f.y + -(PV1f.x);
+R0f.z = PV1f.z;
+R0f.w = PV1f.w;
+R2f.z = R2f.y + PV1f.x;
+PS0f = R2f.z;
+// 3
+R3f.x = R2f.x;
+R4f.y = R2f.y + -(R127f.y);
+R3f.z = PS0f;
+R3f.w = R2f.y;
+R2f.z = R2f.y + R127f.y;
+PS1f = R2f.z;
+// 4
+R4f.xzw = vec3(R2f.x,PS1f,R2f.y);
+// export
+gl_Position = vec4(R1f.x, R1f.y, R1f.z, R1f.w);
+// export
+passParameterSem0 = vec4(R0f.x, R0f.y, R0f.z, R0f.w);
+// export
+passParameterSem1 = vec4(R3f.x, R3f.y, R3f.z, R3f.w);
+// export
+passParameterSem2 = vec4(R4f.x, R4f.y, R4f.z, R4f.w);
+// 0
+}

Source/WindWakerHD/8d68a0e3561ff525_0000000000000000_vs.txt

@@ -0,0 +1,98 @@
+#version 420
+#extension GL_ARB_texture_gather : enable
+#extension GL_ARB_shading_language_packing : enable
+// shader 8d68a0e3561ff525 //scale bloom to res
+const float resScale = ($height/$gameHeight)*$internalRes; 
+uniform ivec4 uf_remappedVS[1];
+uniform vec2 uf_windowSpaceToClipSpaceTransform;
+layout(location = 0) in uvec4 attrDataSem0;
+layout(location = 1) in uvec4 attrDataSem1;
+out gl_PerVertex
+{
+	vec4 gl_Position;
+	float gl_PointSize;
+};
+layout(location = 1) out vec4 passParameterSem1;
+layout(location = 2) out vec4 passParameterSem2;
+layout(location = 0) out vec4 passParameterSem0;
+int clampFI32(int v)
+{
+if( v == 0x7FFFFFFF )
+	return floatBitsToInt(1.0);
+else if( v == 0xFFFFFFFF )
+	return floatBitsToInt(0.0);
+return floatBitsToInt(clamp(intBitsToFloat(v), 0.0, 1.0));
+}
+float mul_nonIEEE(float a, float b){ if( a == 0.0 || b == 0.0 ) return 0.0; return a*b; }
+void main()
+{
+vec4 R0f = vec4(0.0);
+vec4 R1f = vec4(0.0);
+vec4 R2f = vec4(0.0);
+vec4 R3f = vec4(0.0);
+vec4 R126f = vec4(0.0);
+vec4 R127f = vec4(0.0);
+uvec4 attrDecoder;
+float backupReg0f, backupReg1f, backupReg2f, backupReg3f, backupReg4f;
+vec4 PV0f = vec4(0.0), PV1f = vec4(0.0);
+float PS0f = 0.0, PS1f = 0.0;
+vec4 tempf = vec4(0.0);
+float tempResultf;
+int tempResulti;
+ivec4 ARi = ivec4(0);
+bool predResult = true;
+vec3 cubeMapSTM;
+int cubeMapFaceId;
+R0f = floatBitsToInt(ivec4(gl_VertexID, 0, 0, gl_InstanceID));
+attrDecoder.xyz = attrDataSem0.xyz;
+attrDecoder.xyz = (attrDecoder.xyz>>24)|((attrDecoder.xyz>>8)&0xFF00)|((attrDecoder.xyz<<8)&0xFF0000)|((attrDecoder.xyz<<24));
+attrDecoder.w = 0;
+R1f = vec4(intBitsToFloat(int(attrDecoder.x)), intBitsToFloat(int(attrDecoder.y)), intBitsToFloat(int(attrDecoder.z)), intBitsToFloat(floatBitsToInt(1.0)));
+attrDecoder.xy = attrDataSem1.xy;
+attrDecoder.xy = (attrDecoder.xy>>24)|((attrDecoder.xy>>8)&0xFF00)|((attrDecoder.xy<<8)&0xFF0000)|((attrDecoder.xy<<24));
+attrDecoder.z = 0;
+attrDecoder.w = 0;
+R2f = vec4(intBitsToFloat(int(attrDecoder.x)), intBitsToFloat(int(attrDecoder.y)), intBitsToFloat(floatBitsToInt(0.0)), intBitsToFloat(floatBitsToInt(1.0)));
+// 0
+backupReg0f = R1f.x;
+backupReg1f = R1f.y;
+R1f.x = backupReg0f;
+R1f.x *= 2.0;
+R1f.y = backupReg1f;
+R1f.y *= 2.0;
+R1f.z = 0.0;
+R1f.w = 1.0;
+R127f.y = intBitsToFloat(uf_remappedVS[0].x) * intBitsToFloat(0x3fb13a93) / resScale;
+PS0f = R127f.y;
+// 1
+PV1f.x = intBitsToFloat(uf_remappedVS[0].x)  * intBitsToFloat(0x404ec4f0) / resScale;
+R126f.y = intBitsToFloat(uf_remappedVS[0].x)  * intBitsToFloat(0x40a275f7);
+R3f.z = R2f.x + PS0f;
+R3f.w = R2f.x;
+R3f.x = R2f.y;
+PS1f = R3f.x;
+// 2
+R0f.x = PS1f;
+R3f.y = R2f.x + -(R127f.y);
+R0f.z = R2f.x + PV1f.x;
+R0f.w = R2f.x;
+R0f.y = R2f.x + -(PV1f.x);
+PS0f = R0f.y;
+// 3
+backupReg0f = R2f.x;
+backupReg0f = R2f.x;
+backupReg0f = R2f.x;
+R2f.x = R3f.x;
+R2f.y = backupReg0f + -(R126f.y);
+R2f.z = backupReg0f + R126f.y;
+R2f.w = backupReg0f;
+// export
+gl_Position = vec4(R1f.x, R1f.y, R1f.z, R1f.w);
+// export
+passParameterSem1 = vec4(R0f.x, R0f.y, R0f.z, R0f.w);
+// export
+passParameterSem2 = vec4(R2f.x, R2f.y, R2f.z, R2f.w);
+// export
+passParameterSem0 = vec4(R3f.x, R3f.y, R3f.z, R3f.w);
+// 0
+}

Source/WindWakerHD/_d283b9338c6b10c5_0000000000000000_vs.txt

@@ -0,0 +1,78 @@
+#version 420
+#extension GL_ARB_texture_gather : enable
+#extension GL_ARB_shading_language_packing : enable
+// shader d283b9338c6b10c5 
+//AO noise/de-banding scaling is broken in 1.4
+const float resScale = ($height/$gameHeight)*$internalRes; 
+uniform ivec4 uf_remappedVS[1];
+uniform vec2 uf_windowSpaceToClipSpaceTransform;
+layout(location = 0) in uvec4 attrDataSem0;
+layout(location = 1) in uvec4 attrDataSem1;
+out gl_PerVertex
+{
+	vec4 gl_Position;
+	float gl_PointSize;
+};
+layout(location = 0) out vec4 passParameterSem1;
+int clampFI32(int v)
+{
+if( v == 0x7FFFFFFF )
+	return floatBitsToInt(1.0);
+else if( v == 0xFFFFFFFF )
+	return floatBitsToInt(0.0);
+return floatBitsToInt(clamp(intBitsToFloat(v), 0.0, 1.0));
+}
+float mul_nonIEEE(float a, float b){ if( a == 0.0 || b == 0.0 ) return 0.0; return a*b; }
+void main()
+{
+vec4 R0f = vec4(0.0);
+vec4 R1f = vec4(0.0);
+vec4 R2f = vec4(0.0);
+uvec4 attrDecoder;
+float backupReg0f, backupReg1f, backupReg2f, backupReg3f, backupReg4f;
+vec4 PV0f = vec4(0.0), PV1f = vec4(0.0);
+float PS0f = 0.0, PS1f = 0.0;
+vec4 tempf = vec4(0.0);
+float tempResultf;
+int tempResulti;
+ivec4 ARi = ivec4(0);
+bool predResult = true;
+vec3 cubeMapSTM;
+int cubeMapFaceId;
+R0f = floatBitsToInt(ivec4(gl_VertexID, 0, 0, gl_InstanceID));
+attrDecoder.xyz = attrDataSem0.xyz;
+attrDecoder.xyz = (attrDecoder.xyz>>24)|((attrDecoder.xyz>>8)&0xFF00)|((attrDecoder.xyz<<8)&0xFF0000)|((attrDecoder.xyz<<24));
+attrDecoder.w = 0;
+R1f = vec4(intBitsToFloat(int(attrDecoder.x)), intBitsToFloat(int(attrDecoder.y)), intBitsToFloat(int(attrDecoder.z)), intBitsToFloat(floatBitsToInt(1.0)));
+attrDecoder.xy = attrDataSem1.xy;
+attrDecoder.xy = (attrDecoder.xy>>24)|((attrDecoder.xy>>8)&0xFF00)|((attrDecoder.xy<<8)&0xFF0000)|((attrDecoder.xy<<24));
+attrDecoder.z = 0;
+attrDecoder.w = 0;
+R2f = vec4(intBitsToFloat(int(attrDecoder.x)), intBitsToFloat(int(attrDecoder.y)), intBitsToFloat(floatBitsToInt(0.0)), intBitsToFloat(floatBitsToInt(1.0)));
+// 0
+backupReg0f = R1f.x;
+backupReg1f = R1f.y;
+R1f.x = backupReg0f;
+R1f.x *= 2.0;
+R1f.y = backupReg1f;
+R1f.y *= 2.0;
+R1f.z = 0.0;
+R1f.w = 1.0;
+PS0f = 1.0 / intBitsToFloat(uf_remappedVS[0].x)*resScale;
+// 1
+PV1f.w = mul_nonIEEE(R2f.x, PS0f);
+PS1f = 1.0 / intBitsToFloat(uf_remappedVS[0].y)*resScale;
+// 2
+PV0f.y = mul_nonIEEE(PV1f.w, intBitsToFloat(uf_remappedVS[0].w));
+PV0f.z = mul_nonIEEE(R2f.y, PS1f);
+// 3
+PV1f.x = mul_nonIEEE(PV0f.z, intBitsToFloat(uf_remappedVS[0].w));
+R2f.z = PV0f.y;
+// 4
+R2f.w = PV1f.x;
+// export
+gl_Position = vec4(R1f.x, R1f.y, R1f.z, R1f.w);
+// export
+passParameterSem1 = vec4(R2f.x, R2f.y, R2f.z, R2f.w);
+// 0
+}

Source/WindWakerHD/d9c81460d6984bb2_0000000000000000_vs.txt

@@ -0,0 +1,109 @@
+#version 420
+#extension GL_ARB_texture_gather : enable
+#extension GL_ARB_shading_language_packing : enable
+// shader d9c81460d6984bb2
+//blur shadows step 1
+const float resScale = ($height/$gameHeight)*$internalRes; 
+uniform ivec4 uf_remappedVS[5];
+uniform vec2 uf_windowSpaceToClipSpaceTransform;
+layout(location = 0) in uvec4 attrDataSem0;
+out gl_PerVertex
+{
+	vec4 gl_Position;
+	float gl_PointSize;
+};
+layout(location = 0) out vec4 passParameterSem0;
+int clampFI32(int v)
+{
+if( v == 0x7FFFFFFF )
+	return floatBitsToInt(1.0);
+else if( v == 0xFFFFFFFF )
+	return floatBitsToInt(0.0);
+return floatBitsToInt(clamp(intBitsToFloat(v), 0.0, 1.0));
+}
+float mul_nonIEEE(float a, float b){ if( a == 0.0 || b == 0.0 ) return 0.0; return a*b; }
+void main()
+{
+vec4 R0f = vec4(0.0);
+vec4 R1f = vec4(0.0);
+vec4 R126f = vec4(0.0);
+vec4 R127f = vec4(0.0);
+uvec4 attrDecoder;
+float backupReg0f, backupReg1f, backupReg2f, backupReg3f, backupReg4f;
+vec4 PV0f = vec4(0.0), PV1f = vec4(0.0);
+float PS0f = 0.0, PS1f = 0.0;
+vec4 tempf = vec4(0.0);
+float tempResultf;
+int tempResulti;
+ivec4 ARi = ivec4(0);
+bool predResult = true;
+vec3 cubeMapSTM;
+int cubeMapFaceId;
+R0f = floatBitsToInt(ivec4(gl_VertexID, 0, 0, gl_InstanceID));
+attrDecoder.xyz = attrDataSem0.xyz;
+attrDecoder.xyz = (attrDecoder.xyz>>24)|((attrDecoder.xyz>>8)&0xFF00)|((attrDecoder.xyz<<8)&0xFF0000)|((attrDecoder.xyz<<24));
+attrDecoder.w = 0;
+R1f = vec4(intBitsToFloat(int(attrDecoder.x)), intBitsToFloat(int(attrDecoder.y)), intBitsToFloat(int(attrDecoder.z)), intBitsToFloat(floatBitsToInt(1.0)));
+// 0
+R127f.x = (R1f.x > 0.0)?1.0:0.0;
+R127f.x /= 2.0;
+R127f.y = -(R1f.y);
+PV0f.y = R127f.y;
+R127f.z = (0.0 > R1f.x)?1.0:0.0;
+R127f.z /= 2.0;
+R127f.w = 1.0;
+PV0f.w = R127f.w;
+R126f.x = intBitsToFloat(uf_remappedVS[0].z) * intBitsToFloat(0x3fae8a72)/ resScale;// fix all...
+PS0f = R126f.x;
+// 1
+R0f.x = dot(vec4(R1f.x,R1f.y,R1f.z,PV0f.w),vec4(intBitsToFloat(uf_remappedVS[1].x),intBitsToFloat(uf_remappedVS[1].y),intBitsToFloat(uf_remappedVS[1].z),intBitsToFloat(uf_remappedVS[1].w)));
+PV1f.x = R0f.x;
+PV1f.y = R0f.x;
+PV1f.z = R0f.x;
+PV1f.w = R0f.x;
+R126f.w = (PV0f.y > 0.0)?1.0:0.0;
+R126f.w /= 2.0;
+PS1f = R126f.w;
+// 2
+backupReg0f = R127f.y;
+tempf.x = dot(vec4(R1f.x,R1f.y,R1f.z,R127f.w),vec4(intBitsToFloat(uf_remappedVS[2].x),intBitsToFloat(uf_remappedVS[2].y),intBitsToFloat(uf_remappedVS[2].z),intBitsToFloat(uf_remappedVS[2].w)));
+PV0f.x = tempf.x;
+PV0f.y = tempf.x;
+PV0f.z = tempf.x;
+PV0f.w = tempf.x;
+R0f.y = tempf.x;
+R127f.y = (0.0 > backupReg0f)?1.0:0.0;
+R127f.y /= 2.0;
+PS0f = R127f.y;
+// 3
+backupReg0f = R127f.x;
+tempf.x = dot(vec4(R1f.x,R1f.y,R1f.z,R127f.w),vec4(intBitsToFloat(uf_remappedVS[3].x),intBitsToFloat(uf_remappedVS[3].y),intBitsToFloat(uf_remappedVS[3].z),intBitsToFloat(uf_remappedVS[3].w)));
+PV1f.x = tempf.x;
+PV1f.y = tempf.x;
+PV1f.z = tempf.x;
+PV1f.w = tempf.x;
+R0f.z = tempf.x;
+R127f.x = backupReg0f + -(R127f.z);
+PS1f = R127f.x;
+// 4
+tempf.x = dot(vec4(R1f.x,R1f.y,R1f.z,R127f.w),vec4(intBitsToFloat(uf_remappedVS[4].x),intBitsToFloat(uf_remappedVS[4].y),intBitsToFloat(uf_remappedVS[4].z),intBitsToFloat(uf_remappedVS[4].w)));
+PV0f.x = tempf.x;
+PV0f.y = tempf.x;
+PV0f.z = tempf.x;
+PV0f.w = tempf.x;
+R0f.w = tempf.x;
+PS0f = R126f.w + -(R127f.y);
+// 5
+PV1f.y = PS0f + 0.5;
+PV1f.z = R127f.x + 0.5;
+// 6
+R1f.x = PV1f.y;
+R1f.y = PV1f.z + -(R126f.x);
+R1f.z = PV1f.z + R126f.x;
+R1f.w = PV1f.z;
+// export
+gl_Position = vec4(R0f.x, R0f.y, R0f.z, R0f.w);
+// export
+passParameterSem0 = vec4(R1f.x, R1f.y, R1f.z, R1f.w);
+// 0
+}

Source/WindWakerHD/rules.txt

@@ -14,20 +14,6 @@ $gameHeight = 1080
 
 // Performance
 
-[Preset]
-name = 256x144
-$width = 256
-$height = 144
-$gameWidth = 1920
-$gameHeight = 1080
-
-[Preset]
-name = 427x240
-$width = 427
-$height = 240
-$gameWidth = 1920
-$gameHeight = 1080
-
 [Preset]
 name = 640x360
 $width = 640