Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

code cleanup:

Browse Source 
linearrgb_to_srgb_ushort4_predivide() was calling `linearrgb_to_srgb(t) * alpha` twice in the FTOUSHORT macro, which gcc didn't optimize out.
This commit is contained in:
Campbell Barton
2012-11-07 23:55:52 +00:00
parent 353ad46e10
commit a9132591e6
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/blenlib/intern/math_color_inline.c
View File

@@ -164,7 +164,11 @@ MINLINE void linearrgb_to_srgb_ushort4_predivide(unsigned short srgb[4], const f
for (i = 0; i < 3; ++i) { for (i = 0; i < 3; ++i) {
t = linear[i] * inv_alpha; t = linear[i] * inv_alpha;
srgb[i] = (t < 1.0f) ? (unsigned short) (to_srgb_table_lookup(t) * alpha) : FTOUSHORT(linearrgb_to_srgb(t) * alpha); srgb[i] = (t <= 1.0f) ?
/* warning - converts: float -> short -> float -> short */
(unsigned short) (to_srgb_table_lookup(t) * alpha) :
/* if FTOUSHORT was an inline function this could be done less confusingly */
((t = linearrgb_to_srgb(t) * alpha), FTOUSHORT(t));
} }
srgb[3] = FTOUSHORT(linear[3]); srgb[3] = FTOUSHORT(linear[3]);