[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57314] trunk/blender/intern/cycles/kernel : Cycles:

[Thomas Dinges]

Revision: 57314
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57314
Author:   dingto
Date:     2013-06-09 15:09:15 +0000 (Sun, 09 Jun 2013)
Log Message:
-----------
Cycles:
* Use float_to_int() functions in a few more places. 

Modified Paths:
--------------
    trunk/blender/intern/cycles/kernel/closure/bsdf_diffuse_ramp.h
    trunk/blender/intern/cycles/kernel/closure/bsdf_phong_ramp.h
    trunk/blender/intern/cycles/kernel/svm/svm_convert.h
    trunk/blender/intern/cycles/kernel/svm/svm_image.h

Modified: trunk/blender/intern/cycles/kernel/closure/bsdf_diffuse_ramp.h
===================================================================
--- trunk/blender/intern/cycles/kernel/closure/bsdf_diffuse_ramp.h	2013-06-09 14:20:46 UTC (rev 57313)
+++ trunk/blender/intern/cycles/kernel/closure/bsdf_diffuse_ramp.h	2013-06-09 15:09:15 UTC (rev 57314)
@@ -40,7 +40,7 @@
 	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;

Modified: trunk/blender/intern/cycles/kernel/closure/bsdf_phong_ramp.h
===================================================================
--- trunk/blender/intern/cycles/kernel/closure/bsdf_phong_ramp.h	2013-06-09 14:20:46 UTC (rev 57313)
+++ trunk/blender/intern/cycles/kernel/closure/bsdf_phong_ramp.h	2013-06-09 15:09:15 UTC (rev 57314)
@@ -40,7 +40,7 @@
 	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;

Modified: trunk/blender/intern/cycles/kernel/svm/svm_convert.h
===================================================================
--- trunk/blender/intern/cycles/kernel/svm/svm_convert.h	2013-06-09 14:20:46 UTC (rev 57313)
+++ trunk/blender/intern/cycles/kernel/svm/svm_convert.h	2013-06-09 15:09:15 UTC (rev 57314)
@@ -25,7 +25,7 @@
 	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: {

Modified: trunk/blender/intern/cycles/kernel/svm/svm_image.h
===================================================================
--- trunk/blender/intern/cycles/kernel/svm/svm_image.h	2013-06-09 14:20:46 UTC (rev 57313)
+++ trunk/blender/intern/cycles/kernel/svm/svm_image.h	2013-06-09 15:09:15 UTC (rev 57314)
@@ -45,7 +45,7 @@
 
 __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;
 }