[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53530] trunk/blender/intern/cycles/kernel : Fix CUDA build error after last commit, and remove some comments.

[Brecht Van Lommel]

Revision: 53530
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53530
Author:   blendix
Date:     2013-01-03 13:18:35 +0000 (Thu, 03 Jan 2013)
Log Message:
-----------
Fix CUDA build error after last commit, and remove some comments.

Modified Paths:
--------------
    trunk/blender/intern/cycles/kernel/kernel_bvh.h
    trunk/blender/intern/cycles/kernel/kernel_light.h
    trunk/blender/intern/cycles/kernel/kernel_primitive.h
    trunk/blender/intern/cycles/kernel/svm/svm_attribute.h

Modified: trunk/blender/intern/cycles/kernel/kernel_bvh.h
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_bvh.h	2013-01-03 12:31:05 UTC (rev 53529)
+++ trunk/blender/intern/cycles/kernel/kernel_bvh.h	2013-01-03 13:18:35 UTC (rev 53530)
@@ -222,7 +222,7 @@
 	float4 P1 = kernel_tex_fetch(__curve_keys, k0);
 	float4 P2 = kernel_tex_fetch(__curve_keys, k1);
 
-	float l = len(P2 - P1); // XXX slower
+	float l = len(P2 - P1);
 	float r1 = P1.w;
 	float r2 = P2.w;
 	float mr = max(r1,r2);
@@ -730,7 +730,7 @@
 
 	float4 P1 = kernel_tex_fetch(__curve_keys, k0);
 	float4 P2 = kernel_tex_fetch(__curve_keys, k1);
-	float l = len(P2 - P1); // XXX slower
+	float l = len(P2 - P1);
 	float r1 = P1.w;
 	float r2 = P2.w;
 	float3 tg = float4_to_float3(P2 - P1) / l;

Modified: trunk/blender/intern/cycles/kernel/kernel_light.h
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_light.h	2013-01-03 12:31:05 UTC (rev 53529)
+++ trunk/blender/intern/cycles/kernel/kernel_light.h	2013-01-03 13:18:35 UTC (rev 53530)
@@ -341,7 +341,7 @@
 	float4 P1 = kernel_tex_fetch(__curve_keys, k0);
 	float4 P2 = kernel_tex_fetch(__curve_keys, k1);
 
-	float l = len(P2 - P1); // XXX slower
+	float l = len(P2 - P1);
 
 	float r1 = P1.w;
 	float r2 = P2.w;

Modified: trunk/blender/intern/cycles/kernel/kernel_primitive.h
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_primitive.h	2013-01-03 12:31:05 UTC (rev 53529)
+++ trunk/blender/intern/cycles/kernel/kernel_primitive.h	2013-01-03 13:18:35 UTC (rev 53530)
@@ -37,7 +37,9 @@
 	{
 		/* for SVM, find attribute by unique id */
 		uint attr_offset = sd->object*kernel_data.bvh.attributes_map_stride;
+#ifdef __HAIR__
 		attr_offset = (sd->segment == ~0)? attr_offset: attr_offset + ATTR_PRIM_CURVE;
+#endif
 		uint4 attr_map = kernel_tex_fetch(__attributes_map, attr_offset);
 		
 		while(attr_map.x != id) {

Modified: trunk/blender/intern/cycles/kernel/svm/svm_attribute.h
===================================================================
--- trunk/blender/intern/cycles/kernel/svm/svm_attribute.h	2013-01-03 12:31:05 UTC (rev 53529)
+++ trunk/blender/intern/cycles/kernel/svm/svm_attribute.h	2013-01-03 13:18:35 UTC (rev 53530)
@@ -28,7 +28,9 @@
 		/* find attribute by unique id */
 		uint id = node.y;
 		uint attr_offset = sd->object*kernel_data.bvh.attributes_map_stride;
+#ifdef __HAIR__
 		attr_offset = (sd->segment == ~0)? attr_offset: attr_offset + ATTR_PRIM_CURVE;
+#endif
 		uint4 attr_map = kernel_tex_fetch(__attributes_map, attr_offset);
 		
 		while(attr_map.x != id) {