diff options
Diffstat (limited to 'intern/cycles')
-rw-r--r-- | intern/cycles/kernel/closure/bsdf_diffuse_ramp.h | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/closure/bsdf_phong_ramp.h | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/svm_convert.h | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/svm_image.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/kernel/closure/bsdf_diffuse_ramp.h b/intern/cycles/kernel/closure/bsdf_diffuse_ramp.h index 8a09979806a..579145bdd80 100644 --- a/intern/cycles/kernel/closure/bsdf_diffuse_ramp.h +++ b/intern/cycles/kernel/closure/bsdf_diffuse_ramp.h @@ -40,7 +40,7 @@ __device float3 bsdf_diffuse_ramp_get_color(const ShaderClosure *sc, const float int MAXCOLORS = 8; float npos = pos * (float)(MAXCOLORS - 1); - int ipos = (int)npos; + int ipos = float_to_int(npos); if (ipos >= (MAXCOLORS - 1)) return colors[MAXCOLORS - 1]; float offset = npos - (float)ipos; diff --git a/intern/cycles/kernel/closure/bsdf_phong_ramp.h b/intern/cycles/kernel/closure/bsdf_phong_ramp.h index e518f3675c8..b51d41486c7 100644 --- a/intern/cycles/kernel/closure/bsdf_phong_ramp.h +++ b/intern/cycles/kernel/closure/bsdf_phong_ramp.h @@ -40,7 +40,7 @@ __device float3 bsdf_phong_ramp_get_color(const ShaderClosure *sc, const float3 int MAXCOLORS = 8; float npos = pos * (float)(MAXCOLORS - 1); - int ipos = (int)npos; + int ipos = float_to_int(npos); if (ipos >= (MAXCOLORS - 1)) return colors[MAXCOLORS - 1]; float offset = npos - (float)ipos; diff --git a/intern/cycles/kernel/svm/svm_convert.h b/intern/cycles/kernel/svm/svm_convert.h index 0050813e2c0..450344c79ff 100644 --- a/intern/cycles/kernel/svm/svm_convert.h +++ b/intern/cycles/kernel/svm/svm_convert.h @@ -25,7 +25,7 @@ __device void svm_node_convert(ShaderData *sd, float *stack, uint type, uint fro switch(type) { case NODE_CONVERT_FI: { float f = stack_load_float(stack, from); - stack_store_int(stack, to, (int)f); + stack_store_int(stack, to, float_to_int(f)); break; } case NODE_CONVERT_FV: { diff --git a/intern/cycles/kernel/svm/svm_image.h b/intern/cycles/kernel/svm/svm_image.h index c7551a72638..57adaa863f1 100644 --- a/intern/cycles/kernel/svm/svm_image.h +++ b/intern/cycles/kernel/svm/svm_image.h @@ -45,7 +45,7 @@ __device_inline int svm_image_texture_wrap_clamp(int x, int width) __device_inline float svm_image_texture_frac(float x, int *ix) { - int i = (int)x - ((x < 0.0f)? 1: 0); + int i = float_to_int(x) - ((x < 0.0f)? 1: 0); *ix = i; return x - (float)i; } |