From 0106b94f9d691245c54fd906e43ae8ee94b527a4 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Sun, 5 Oct 2014 15:29:26 +0600 Subject: Cycles: Fix for debug kernel not working with CUDA --- intern/cycles/device/device_cuda.cpp | 4 ++++ intern/cycles/kernel/kernel_types.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp index bd265f0fdad..44be7779891 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 43becf14825..e5cd23c0925 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; -- cgit v1.2.3