Merge remote-tracking branch 'refs/remotes/origin/experimental'

This commit is contained in:
getdls 2017-11-12 12:45:32 +01:00
commit 5191a80a5c
2 changed files with 15 additions and 6 deletions

View File

@ -7,11 +7,14 @@
//----------------------------settings------------------------------------- //----------------------------settings-------------------------------------
#define adjust_bloom 1 #define adjust_bloom 1
#define adjust_saturation 1
#define contrasty 1 #define contrasty 1
// 0: disable, 1: enable. // 0: disable, 1: enable.
const float bloomFactor = 0.7; // 1.0 is neutral const float bloomFactor = 0.7; // 1.0 is neutral
const float satFactor = 1.3; // 1.0 is neutral. Experimental, adjust native saturation
const float gamma = 0.81; // 1.0 is neutral. Botw is already colour graded at this stage const float gamma = 0.81; // 1.0 is neutral. Botw is already colour graded at this stage
const float exposure = 1.17; // 1.0 is neutral const float exposure = 1.17; // 1.0 is neutral
const float vibrance = 0.008; // 0.0 is neutral const float vibrance = 0.008; // 0.0 is neutral
@ -140,7 +143,13 @@ R125f.w = R126f.x + -(PS0f);
R126f.y = backupReg1f + -(PS0f); R126f.y = backupReg1f + -(PS0f);
PS1f = R126f.y; PS1f = R126f.y;
// 12 // 12
#if (adjust_saturation == 1)
R126f.x = satFactor * (mul_nonIEEE(PV1f.y,intBitsToFloat(uf_remappedPS[0].y)) + intBitsToFloat(uf_remappedPS[0].x));
#else
R126f.x = (mul_nonIEEE(PV1f.y,intBitsToFloat(uf_remappedPS[0].y)) + intBitsToFloat(uf_remappedPS[0].x)); R126f.x = (mul_nonIEEE(PV1f.y,intBitsToFloat(uf_remappedPS[0].y)) + intBitsToFloat(uf_remappedPS[0].x));
#endif
PV0f.x = R126f.x; PV0f.x = R126f.x;
PV0f.y = -(R126f.z) + PV1f.x; PV0f.y = -(R126f.z) + PV1f.x;
// 13 // 13

View File

@ -374,10 +374,10 @@ R2i.y = floatBitsToInt(intBitsToFloat(0x3da22222) * intBitsToFloat(PS1i));
R2i.z = floatBitsToInt(intBitsToFloat(0x3da22222) * intBitsToFloat(PS1i)); R2i.z = floatBitsToInt(intBitsToFloat(0x3da22222) * intBitsToFloat(PS1i));
R13i.w = PV1i.y - R127i.x; R13i.w = PV1i.y - R127i.x;
PV0i.w = R13i.w; PV0i.w = R13i.w;
PS0i = floatBitsToInt(uf_blockPS6[53].y); PS0i = floatBitsToInt(uf_blockPS6[53].y * uf_fragCoordScale.y);
PS0i = floatBitsToInt(intBitsToFloat(PS0i) / 2.0); PS0i = floatBitsToInt(intBitsToFloat(PS0i) / 2.0);
// 3 // 3
R6i.x = floatBitsToInt(uf_blockPS6[53].x); R6i.x = floatBitsToInt(uf_blockPS6[53].x * uf_fragCoordScale.x);
R6i.x = floatBitsToInt(intBitsToFloat(R6i.x) / 2.0); R6i.x = floatBitsToInt(intBitsToFloat(R6i.x) / 2.0);
PV1i.y = PV0i.w << 0x00000002; PV1i.y = PV0i.w << 0x00000002;
R6i.z = floatBitsToInt(-(intBitsToFloat(PS0i))); R6i.z = floatBitsToInt(-(intBitsToFloat(PS0i)));
@ -493,7 +493,7 @@ PV0i.y = floatBitsToInt(intBitsToFloat(R0i.w) + intBitsToFloat(PV1i.w));
R127i.z = floatBitsToInt(mul_nonIEEE(intBitsToFloat(PV1i.y), intBitsToFloat(PS1i))); R127i.z = floatBitsToInt(mul_nonIEEE(intBitsToFloat(PV1i.y), intBitsToFloat(PS1i)));
PV0i.z = R127i.z; PV0i.z = R127i.z;
// 13 // 13
R7i.x = floatBitsToInt((uf_blockPS6[53].x * 0.5 + intBitsToFloat(PV0i.z))); R7i.x = floatBitsToInt((uf_blockPS6[53].x * uf_fragCoordScale.x * 0.5 + intBitsToFloat(PV0i.z)));
R127i.y = floatBitsToInt(intBitsToFloat(PV0i.x) + intBitsToFloat(0xbb03126f)); R127i.y = floatBitsToInt(intBitsToFloat(PV0i.x) + intBitsToFloat(0xbb03126f));
R127i.y = clampFI32(R127i.y); R127i.y = clampFI32(R127i.y);
PV1i.y = R127i.y; PV1i.y = R127i.y;
@ -503,18 +503,18 @@ R8i.x = floatBitsToInt(intBitsToFloat(PV0i.z) + intBitsToFloat(R6i.x));
PS1i = R8i.x; PS1i = R8i.x;
// 14 // 14
R1i.x = floatBitsToInt(intBitsToFloat(R127i.z) + intBitsToFloat(R126i.w)); R1i.x = floatBitsToInt(intBitsToFloat(R127i.z) + intBitsToFloat(R126i.w));
R7i.y = floatBitsToInt((uf_blockPS6[53].y * 0.5 + intBitsToFloat(PV1i.w))); R7i.y = floatBitsToInt((uf_blockPS6[53].y * uf_fragCoordScale.y * 0.5 + intBitsToFloat(PV1i.w)));
R7i.w = PV1i.y; R7i.w = PV1i.y;
R8i.y = floatBitsToInt(intBitsToFloat(PV1i.w) + intBitsToFloat(R6i.z)); R8i.y = floatBitsToInt(intBitsToFloat(PV1i.w) + intBitsToFloat(R6i.z));
PS0i = R8i.y; PS0i = R8i.y;
// 15 // 15
R9i.x = floatBitsToInt((-(uf_blockPS6[53].x) * 0.5 + intBitsToFloat(R127i.z))); R9i.x = floatBitsToInt((-(uf_blockPS6[53].x) * uf_fragCoordScale.x * 0.5 + intBitsToFloat(R127i.z)));
R1i.y = floatBitsToInt(intBitsToFloat(R127i.w) + intBitsToFloat(R2i.w)); R1i.y = floatBitsToInt(intBitsToFloat(R127i.w) + intBitsToFloat(R2i.w));
R8i.w = R127i.y; R8i.w = R127i.y;
R1i.w = R127i.y; R1i.w = R127i.y;
PS1i = R1i.w; PS1i = R1i.w;
// 16 // 16
R9i.y = floatBitsToInt((-(uf_blockPS6[53].y) * 0.5 + intBitsToFloat(R127i.w))); R9i.y = floatBitsToInt((-(uf_blockPS6[53].y) * uf_fragCoordScale.y * 0.5 + intBitsToFloat(R127i.w)));
R9i.w = R127i.y; R9i.w = R127i.y;
} }
if( activeMaskStackC[2] == true ) { if( activeMaskStackC[2] == true ) {