fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 07:28:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

gallium/vl: Parameter substitution in the csc matrix computation

Browse source 
Makes the code significantly more readable.

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Sinclair Yeh <syeh@vmware.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
This commit is contained in:
Thomas Hellstrom 2016-03-04 12:11:23 +01:00
parent 4c3fe3257d
commit bcc9fd378d
1 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/gallium/auxiliary/vl/vl_csc.c
View file

@ -158,6 +158,7 @@ void vl_csc_get_matrix(enum VL_CSC_COLOR_STANDARD cs,
float s = p->saturation;
float b = p->brightness;
float h = p->hue;
float x, y;
const vl_csc_matrix *cstd;
@ -167,6 +168,10 @@ void vl_csc_get_matrix(enum VL_CSC_COLOR_STANDARD cs,
b -= c * 16.0f / 255.0f; /* Adjust for the y bias */
}
/* Parameter substitutions */
x = c * s * cosf(h);
y = c * s * sinf(h);
assert(matrix);
switch (cs) {
@ -187,23 +192,23 @@ void vl_csc_get_matrix(enum VL_CSC_COLOR_STANDARD cs,
}
(*matrix)[0][0] = c * (*cstd)[0][0];
(*matrix)[0][1] = c * (*cstd)[0][1] * s * cosf(h) - c * (*cstd)[0][2] * s * sinf(h);
(*matrix)[0][2] = c * (*cstd)[0][2] * s * cosf(h) + c * (*cstd)[0][1] * s * sinf(h);
(*matrix)[0][1] = (*cstd)[0][1] * x - (*cstd)[0][2] * y;
(*matrix)[0][2] = (*cstd)[0][2] * x + (*cstd)[0][1] * y;
(*matrix)[0][3] = (*cstd)[0][3] + (*cstd)[0][0] * b +
(*cstd)[0][1] * (c * cbbias * s * cosf(h) + c * crbias * s * sinf(h)) +
(*cstd)[0][2] * (c * crbias * s * cosf(h) - c * cbbias * s * sinf(h));
(*cstd)[0][1] * (x * cbbias + y * crbias) +
(*cstd)[0][2] * (x * crbias - y * cbbias);
(*matrix)[1][0] = c * (*cstd)[1][0];
(*matrix)[1][1] = c * (*cstd)[1][1] * s * cosf(h) - c * (*cstd)[1][2] * s * sinf(h);
(*matrix)[1][2] = c * (*cstd)[1][2] * s * cosf(h) + c * (*cstd)[1][1] * s * sinf(h);
(*matrix)[1][1] = (*cstd)[1][1] * x - (*cstd)[1][2] * y;
(*matrix)[1][2] = (*cstd)[1][2] * x + (*cstd)[1][1] * y;
(*matrix)[1][3] = (*cstd)[1][3] + (*cstd)[1][0] * b +
(*cstd)[1][1] * (c * cbbias * s * cosf(h) + c * crbias * s * sinf(h)) +
(*cstd)[1][2] * (c * crbias * s * cosf(h) - c * cbbias * s * sinf(h));
(*cstd)[1][1] * (x * cbbias + y * crbias) +
(*cstd)[1][2] * (x * crbias - y * cbbias);
(*matrix)[2][0] = c * (*cstd)[2][0];
(*matrix)[2][1] = c * (*cstd)[2][1] * s * cosf(h) - c * (*cstd)[2][2] * s * sinf(h);
(*matrix)[2][2] = c * (*cstd)[2][2] * s * cosf(h) + c * (*cstd)[2][1] * s * sinf(h);
(*matrix)[2][1] = (*cstd)[2][1] * x - (*cstd)[2][2] * y;
(*matrix)[2][2] = (*cstd)[2][2] * x + (*cstd)[2][1] * y;
(*matrix)[2][3] = (*cstd)[2][3] + (*cstd)[2][0] * b +
(*cstd)[2][1] * (c * cbbias * s * cosf(h) + c * crbias * s * sinf(h)) +
(*cstd)[2][2] * (c * crbias * s * cosf(h) - c * cbbias * s * sinf(h));
(*cstd)[2][1] * (x * cbbias + y * crbias) +
(*cstd)[2][2] * (x * crbias - y * cbbias);
}