[Bf-blender-cvs] [0106b94] master: Cycles: Fix for debug kernel not working with CUDA

[Sergey Sharybin]

Commit: 0106b94f9d691245c54fd906e43ae8ee94b527a4
Author: Sergey Sharybin
Date:   Sun Oct 5 15:29:26 2014 +0600
Branches: master
https://developer.blender.org/rB0106b94f9d691245c54fd906e43ae8ee94b527a4

Cycles: Fix for debug kernel not working with CUDA

===================================================================

M	intern/cycles/device/device_cuda.cpp
M	intern/cycles/kernel/kernel_types.h

===================================================================

diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp
index bd265f0..44be777 100644
--- a/intern/cycles/device/device_cuda.cpp
+++ b/intern/cycles/device/device_cuda.cpp
@@ -278,6 +278,10 @@ public:
 		if(experimental)
 			command += " -D__KERNEL_CUDA_EXPERIMENTAL__";
 
+#ifdef WITH_CYCLES_DEBUG
+		command += " -D__KERNEL_DEBUG__";
+#endif
+
 		printf("%s\n", command.c_str());
 
 		if(system(command.c_str()) == -1) {
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h
index 43becf1..e5cd23c 100644
--- a/intern/cycles/kernel/kernel_types.h
+++ b/intern/cycles/kernel/kernel_types.h
@@ -864,7 +864,7 @@ typedef struct KernelFilm {
 
 #ifdef __KERNEL_DEBUG__
 	int pass_bvh_traversal_steps;
-	int pad[3];
+	int pass_pad3, pass_pad4, pass_pad5;
 #endif
 } KernelFilm;