From f74d85ffc8232a859b1419f5dc25b244ae04375f Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 7 May 2018 17:31:28 +0200 Subject: Cleanup: rename char/float conversion functions - FTOCHAR -> unit_float_to_uchar_clamp - F3TOCHAR3 -> unit_float_to_uchar_clamp_v3 (swap args) - F4TOCHAR4 -> unit_float_to_uchar_clamp_v4 (swap args) - FTOUSHORT -> unit_float_to_ushort_clamp - USHORTTOUCHAR -> unit_ushort_to_uchar --- source/blender/gpu/intern/gpu_buffers.c | 4 ++-- source/blender/gpu/intern/gpu_texture.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'source/blender/gpu/intern') diff --git a/source/blender/gpu/intern/gpu_buffers.c b/source/blender/gpu/intern/gpu_buffers.c index 85543ca29b2..38e847da967 100644 --- a/source/blender/gpu/intern/gpu_buffers.c +++ b/source/blender/gpu/intern/gpu_buffers.c @@ -1294,7 +1294,7 @@ void GPU_pbvh_grid_buffers_update( diffuse_color, vd->color); } else { - F3TOCHAR3(diffuse_color, vd->color); + unit_float_to_uchar_clamp_v3(vd->color, diffuse_color); } } } @@ -1336,7 +1336,7 @@ void GPU_pbvh_grid_buffers_update( vd->color); } else { - F3TOCHAR3(diffuse_color, vd->color); + unit_float_to_uchar_clamp_v3(vd->color, diffuse_color); } } } diff --git a/source/blender/gpu/intern/gpu_texture.c b/source/blender/gpu/intern/gpu_texture.c index 1c97c2ce811..f50465189b2 100644 --- a/source/blender/gpu/intern/gpu_texture.c +++ b/source/blender/gpu/intern/gpu_texture.c @@ -74,7 +74,7 @@ static unsigned char *GPU_texture_convert_pixels(int length, const float *fpixel p = pixels = MEM_callocN(sizeof(unsigned char) * len, "GPUTexturePixels"); for (int a = 0; a < len; a++, p++, fp++) - *p = FTOCHAR((*fp)); + *p = unit_float_to_uchar_clamp((*fp)); return pixels; } -- cgit v1.2.3