sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Cycles: Fix for debug kernel not working with CUDA

Browse Source
This commit is contained in:
Sergey Sharybin 2014-10-05 15:29:26 +06:00
parent 15af15eb56
commit 0106b94f9d
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
intern/cycles/device/device_cuda.cpp
View File

@ -278,6 +278,10 @@ public:
if(experimental) if(experimental)
command += " -D__KERNEL_CUDA_EXPERIMENTAL__"; command += " -D__KERNEL_CUDA_EXPERIMENTAL__";
#ifdef WITH_CYCLES_DEBUG
command += " -D__KERNEL_DEBUG__";
#endif
printf("%s\n", command.c_str()); printf("%s\n", command.c_str());
if(system(command.c_str()) == -1) { if(system(command.c_str()) == -1) {

2
intern/cycles/kernel/kernel_types.h
View File

@ -864,7 +864,7 @@ typedef struct KernelFilm {
#ifdef __KERNEL_DEBUG__ #ifdef __KERNEL_DEBUG__
int pass_bvh_traversal_steps; int pass_bvh_traversal_steps;
int pad[3]; int pass_pad3, pass_pad4, pass_pad5;
#endif #endif
} KernelFilm; } KernelFilm;