[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42337] trunk/blender/intern/cycles/kernel /svm/svm_sepcomb_rgb.h: cycles separateRGB: fix for cuda kernel building.

Dalai Felinto dfelinto at gmail.com
Fri Dec 2 08:13:50 CET 2011


Revision: 42337
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42337
Author:   dfelinto
Date:     2011-12-02 07:13:48 +0000 (Fri, 02 Dec 2011)
Log Message:
-----------
cycles separateRGB: fix for cuda kernel building.
Array indexing doesn't work there.

I'm yet to setup my CUDA computer, in the meantime this proved to work (tested by Daniel Salazar).
If I found other ways of doing it I get back to that.

Modified Paths:
--------------
    trunk/blender/intern/cycles/kernel/svm/svm_sepcomb_rgb.h

Modified: trunk/blender/intern/cycles/kernel/svm/svm_sepcomb_rgb.h
===================================================================
--- trunk/blender/intern/cycles/kernel/svm/svm_sepcomb_rgb.h	2011-12-02 05:54:48 UTC (rev 42336)
+++ trunk/blender/intern/cycles/kernel/svm/svm_sepcomb_rgb.h	2011-12-02 07:13:48 UTC (rev 42337)
@@ -30,8 +30,14 @@
 {
 	float3 color = stack_load_float3(stack, icolor_offset);
 
-	if (stack_valid(out_offset))
-		stack_store_float(stack, out_offset, color[color_index]); 
+	if (stack_valid(out_offset)) {
+		if (color_index == 0)
+			stack_store_float(stack, out_offset, color.x);
+		else if (color_index == 1)
+			stack_store_float(stack, out_offset, color.y);
+		else
+			stack_store_float(stack, out_offset, color.z);
+	}
 }
 
 CCL_NAMESPACE_END




More information about the Bf-blender-cvs mailing list