diff options
Diffstat (limited to 'intern/cycles/util/util_color.h')
| -rw-r--r-- | intern/cycles/util/util_color.h | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/intern/cycles/util/util_color.h b/intern/cycles/util/util_color.h index 114f0f9bf79..c73beab98dc 100644 --- a/intern/cycles/util/util_color.h +++ b/intern/cycles/util/util_color.h @@ -157,8 +157,7 @@ ccl_device float3 xyz_to_rgb(float x, float y, float z) 0.055648f * x + -0.204043f * y + 1.057311f * z); } -#ifndef __KERNEL_OPENCL__ -# ifdef __KERNEL_SSE2__ +#ifdef __KERNEL_SSE2__ /* * Calculate initial guess for arg^exp based on float representation * This method gives a constant bias, which can be easily compensated by multiplication with bias_coeff. @@ -213,16 +212,23 @@ ccl_device ssef color_srgb_to_scene_linear(const ssef &c) ssef gte = fastpow24(gtebase); return select(cmp, lt, gte); } -# endif /* __KERNEL_SSE2__ */ +#endif /* __KERNEL_SSE2__ */ -ccl_device float3 color_srgb_to_scene_linear(float3 c) +ccl_device float3 color_srgb_to_scene_linear_v3(float3 c) { return make_float3(color_srgb_to_scene_linear(c.x), color_srgb_to_scene_linear(c.y), color_srgb_to_scene_linear(c.z)); } -ccl_device float4 color_srgb_to_scene_linear(float4 c) +ccl_device float3 color_scene_linear_to_srgb_v3(float3 c) +{ + return make_float3(color_scene_linear_to_srgb(c.x), + color_scene_linear_to_srgb(c.y), + color_scene_linear_to_srgb(c.z)); +} + +ccl_device float4 color_srgb_to_scene_linear_v4(float4 c) { #ifdef __KERNEL_SSE2__ ssef r_ssef; @@ -239,15 +245,6 @@ ccl_device float4 color_srgb_to_scene_linear(float4 c) #endif } -ccl_device float3 color_scene_linear_to_srgb(float3 c) -{ - return make_float3(color_scene_linear_to_srgb(c.x), - color_scene_linear_to_srgb(c.y), - color_scene_linear_to_srgb(c.z)); -} - -#endif /* __KERNEL_OPENCL__ */ - ccl_device float linear_rgb_to_gray(float3 c) { return c.x*0.2126f + c.y*0.7152f + c.z*0.0722f; |