[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50448] trunk/blender/intern/cycles/kernel : Cycles compiler fixes related to OSL changes:

[Lukas Toenne]

Revision: 50448
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50448
Author:   lukastoenne
Date:     2012-09-06 07:44:49 +0000 (Thu, 06 Sep 2012)
Log Message:
-----------
Cycles compiler fixes related to OSL changes:

* reverted r50430
* removed 2 util_params.h includes from r50428, these were causing trouble with OIIO in CUDA compilation. The purpose of these was to define the ustring type, but can just use the standard string type from util_string as well.

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50430
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50428

Modified Paths:
--------------
    trunk/blender/intern/cycles/kernel/kernel_accumulate.h
    trunk/blender/intern/cycles/kernel/kernel_triangle.h
    trunk/blender/intern/cycles/kernel/kernel_types.h

Modified: trunk/blender/intern/cycles/kernel/kernel_accumulate.h
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_accumulate.h	2012-09-06 06:18:10 UTC (rev 50447)
+++ trunk/blender/intern/cycles/kernel/kernel_accumulate.h	2012-09-06 07:44:49 UTC (rev 50448)
@@ -301,7 +301,9 @@
 
 __device_inline void path_radiance_clamp(PathRadiance *L, float3 *L_sum, float clamp)
 {
+	#ifdef __OSL__
 	using std::isfinite;
+	#endif
 
 	float sum = fabsf((*L_sum).x) + fabsf((*L_sum).y) + fabsf((*L_sum).z);
 

Modified: trunk/blender/intern/cycles/kernel/kernel_triangle.h
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_triangle.h	2012-09-06 06:18:10 UTC (rev 50447)
+++ trunk/blender/intern/cycles/kernel/kernel_triangle.h	2012-09-06 07:44:49 UTC (rev 50448)
@@ -18,8 +18,6 @@
 
 #include "kernel_projection.h"
 
-#include "util_param.h"
-
 CCL_NAMESPACE_BEGIN
 
 /* Point on triangle for Moller-Trumbore triangles */

Modified: trunk/blender/intern/cycles/kernel/kernel_types.h
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_types.h	2012-09-06 06:18:10 UTC (rev 50447)
+++ trunk/blender/intern/cycles/kernel/kernel_types.h	2012-09-06 07:44:49 UTC (rev 50448)
@@ -22,7 +22,7 @@
 #include "kernel_math.h"
 #include "svm/svm_types.h"
 
-#include "util_param.h"
+#include "util_string.h"
 
 #ifndef __KERNEL_GPU__
 #define __KERNEL_CPU__
@@ -370,28 +370,28 @@
 	ATTR_STD_NOT_FOUND = ~0
 } AttributeStandard;
 
-__device ustring attribute_standard_name(AttributeStandard std)
+__device string attribute_standard_name(AttributeStandard std)
 {
 	if(std == ATTR_STD_VERTEX_NORMAL)
-		return ustring("N");
+		return string("N");
 	else if(std == ATTR_STD_FACE_NORMAL)
-		return ustring("Ng");
+		return string("Ng");
 	else if(std == ATTR_STD_UV)
-		return ustring("uv");
+		return string("uv");
 	else if(std == ATTR_STD_GENERATED)
-		return ustring("generated");
+		return string("generated");
 	else if(std == ATTR_STD_POSITION_UNDEFORMED)
-		return ustring("undeformed");
+		return string("undeformed");
 	else if(std == ATTR_STD_POSITION_UNDISPLACED)
-		return ustring("undisplaced");
+		return string("undisplaced");
 	else if(std == ATTR_STD_MOTION_PRE)
-		return ustring("motion_pre");
+		return string("motion_pre");
 	else if(std == ATTR_STD_MOTION_POST)
-		return ustring("motion_post");
+		return string("motion_post");
 	else if(std == ATTR_STD_PARTICLE)
-		return ustring("particle");
+		return string("particle");
 	
-	return ustring();
+	return string();
 }
 
 /* Closure data */