More

Author: Filoppi

bin/resources/shaders/dx11/convert.fx

@@ -5,6 +5,13 @@
 #define PS_HDR 0
 #endif
 
+#if PS_HDR
+//#define NEUTRAL_ALPHA 127.5f
+#define NEUTRAL_ALPHA 128.0f
+#else
+#define NEUTRAL_ALPHA 128.0f
+#endif
+
 struct VS_INPUT
 {
 	float4 p : POSITION;
@@ -147,6 +154,7 @@ PS_OUTPUT ps_datm1_rta_correction(PS_INPUT input)
 	return output;
 }
 
+//TODO: these in HDR?
 PS_OUTPUT ps_datm0_rta_correction(PS_INPUT input)
 {
 	PS_OUTPUT output;
@@ -162,21 +170,29 @@ PS_OUTPUT ps_rta_correction(PS_INPUT input)
 {
 	PS_OUTPUT output;
 	float4 value = sample_c(input.t);
-#if 1 //TODO: saturate this and the above+below ones too? I was suggested to not to
+#if PS_HDR && 0 //TODO: saturate this and the above+below ones too? I was suggested to not to. Anyway this is not needed until proven otherwise.
 	value.a = saturate(value.a);
 #endif
-	output.c = float4(value.rgb, value.a * (255.0f / 128.25f));
+#if PS_HDR
+	output.c = float4(value.rgb, value.a * (255.0f / NEUTRAL_ALPHA));
+#else
+	output.c = float4(value.rgb, value.a * (255.0f / (NEUTRAL_ALPHA + 0.25f)));
+#endif
 	return output;
 }
 
 PS_OUTPUT ps_rta_decorrection(PS_INPUT input)
 {
 	PS_OUTPUT output;
 	float4 value = sample_c(input.t);
-#if 1
+#if PS_HDR && 0
 	value.a = saturate(value.a);
 #endif
-	output.c = float4(value.rgb, value.a * (128.25f / 255.0f));
+#if PS_HDR
+	output.c = float4(value.rgb, value.a * (NEUTRAL_ALPHA / 255.0f));
+#else
+	output.c = float4(value.rgb, value.a * ((NEUTRAL_ALPHA + 0.25f) / 255.0f));
+#endif
 	return output;
 }
 
@@ -477,6 +493,7 @@ PS_OUTPUT ps_yuv(PS_INPUT input)
 	return output;
 }
 
+//TODO: these in HDR?
 float ps_stencil_image_init_0(PS_INPUT input) : SV_Target
 {
 	float c;
@@ -497,6 +514,7 @@ float ps_stencil_image_init_1(PS_INPUT input) : SV_Target
 	return c;
 }
 
+//TODO: these in HDR?
 float ps_stencil_image_init_2(PS_INPUT input)
 	: SV_Target
 {

bin/resources/shaders/dx11/merge.fx

@@ -21,7 +21,8 @@ struct PS_INPUT
 float4 ps_main0(PS_INPUT input) : SV_Target0
 {
 	float4 c = Texture.Sample(Sampler, input.t);
-	c.a *= 2.0f;
+	// Alpha 0x80 (128) would be interpreted as 1 (neutral) here, but after it's multiplied by 2 and clamped to 0xFF
+	c.a = saturate(c.a * 2.0f); //TODO: why? Explain it. Shouldn't this be 255/128 (1.9921875)? Especially if the source texture was RTAd?
 	return c;
 }