mat3 is the other hand from matrix3x3

also vec3 from float3 for consistency
This commit is contained in:
AzaezelX 2022-08-28 22:58:40 -05:00
parent 05409537b0
commit 433149a0af
2 changed files with 9 additions and 9 deletions

View file

@ -53,7 +53,7 @@ uniform float whitePoint;
uniform float logContrast; uniform float logContrast;
uniform float brightnessValue; uniform float brightnessValue;
uniform float saturationValue; uniform float saturationValue;
uniform float3 colorFilter; uniform vec3 colorFilter;
out vec4 OUT_col; out vec4 OUT_col;

View file

@ -25,17 +25,17 @@
// sRGB => XYZ => D65_2_D60 => AP1 => RRT_SAT // sRGB => XYZ => D65_2_D60 => AP1 => RRT_SAT
const mat3 ACESInputMat = mat3 const mat3 ACESInputMat = mat3
( (
0.59719, 0.35458, 0.04823, 0.59719, 0.07600, 0.02840,
0.07600, 0.90834, 0.01566, 0.35458, 0.90834, 0.13383,
0.02840, 0.13383, 0.83777 0.04823, 0.01566, 0.83777
); );
// ODT_SAT => XYZ => D60_2_D65 => sRGB // ODT_SAT => XYZ => D60_2_D65 => sRGB
const mat3 ACESOutputMat = mat3 const mat3 ACESOutputMat = mat3
( (
1.60475, -0.53108, -0.07367, 1.60475, -0.10208, -0.00327,
-0.10208, 1.10813, -0.00605, -0.53108, 1.10813, -0.07276,
-0.00327, -0.07276, 1.07602 -0.07367, -0.00605, 1.07602
); );
vec3 RRTAndODTFit(vec3 x, float w) vec3 RRTAndODTFit(vec3 x, float w)