[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46104] trunk/blender/intern/cycles/kernel : Cycles: remove a few usages of double, to fix opencl warnings.

[Brecht Van Lommel]

Revision: 46104
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46104
Author:   blendix
Date:     2012-04-30 10:03:13 +0000 (Mon, 30 Apr 2012)
Log Message:
-----------
Cycles: remove a few usages of double, to fix opencl warnings.

Modified Paths:
--------------
    trunk/blender/intern/cycles/kernel/kernel_camera.h
    trunk/blender/intern/cycles/kernel/kernel_compat_opencl.h
    trunk/blender/intern/cycles/kernel/svm/svm_gamma.h

Modified: trunk/blender/intern/cycles/kernel/kernel_camera.h
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_camera.h	2012-04-30 10:00:55 UTC (rev 46103)
+++ trunk/blender/intern/cycles/kernel/kernel_camera.h	2012-04-30 10:03:13 UTC (rev 46104)
@@ -130,7 +130,7 @@
 	float3 Pcamera = transform_perspective(&rastertocamera, make_float3(raster_x, raster_y, 0.0f));
 
 	/* create ray form raster position */
-	ray->P = make_float3(0.0, 0.0f, 0.0f);
+	ray->P = make_float3(0.0f, 0.0f, 0.0f);
 	ray->D = equirectangular_to_direction(Pcamera.x, Pcamera.y);
 
 	/* transform ray from camera to world */

Modified: trunk/blender/intern/cycles/kernel/kernel_compat_opencl.h
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_compat_opencl.h	2012-04-30 10:00:55 UTC (rev 46103)
+++ trunk/blender/intern/cycles/kernel/kernel_compat_opencl.h	2012-04-30 10:03:13 UTC (rev 46104)
@@ -78,7 +78,7 @@
 
 #define make_float2(x, y) ((float2)(x, y))
 #ifdef __CL_NO_FLOAT3__
-#define make_float3(x, y, z) ((float4)(x, y, z, 0.0))
+#define make_float3(x, y, z) ((float4)(x, y, z, 0.0f))
 #else
 #define make_float3(x, y, z) ((float3)(x, y, z))
 #endif

Modified: trunk/blender/intern/cycles/kernel/svm/svm_gamma.h
===================================================================
--- trunk/blender/intern/cycles/kernel/svm/svm_gamma.h	2012-04-30 10:00:55 UTC (rev 46103)
+++ trunk/blender/intern/cycles/kernel/svm/svm_gamma.h	2012-04-30 10:03:13 UTC (rev 46104)
@@ -23,11 +23,11 @@
 	float3 color = stack_load_float3(stack, in_color);
 	float gamma = stack_load_float(stack, in_gamma);
 
-	if (color.x > 0.0)
+	if (color.x > 0.0f)
 		color.x = powf(color.x, gamma);
-	if (color.y > 0.0)
+	if (color.y > 0.0f)
 		color.y = powf(color.y, gamma);
-	if (color.z > 0.0)
+	if (color.z > 0.0f)
 		color.z = powf(color.z, gamma);
 
 	if (stack_valid(out_color))