diff options
| author | Thomas Dinges <blender@dingto.org> | 2013-08-10 00:03:49 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2013-08-10 00:03:49 +0400 |
| commit | 743a7a4a4b2b6999b911704b6367962fc365474a (patch) | |
| tree | 8561ee8d11ecdb360b48eb19bc9932171cf71572 /intern/cycles/device/device_cuda.cpp | |
| parent | be7b4e26b19d705224dc6833892f792659662777 (diff) | |
Cycles:
* GPU kernel can now be compiled without __NON_PROGRESSIVE__ again, was broken after my last commit. Also add a check for have_error(), in case the GPU kernel comes without Non-Progressive, to avoid a crash.
* Don't compile progressive kernel twice on CPU, if __NON_PROGRESSIVE__ would be disabled there.
Diffstat (limited to 'intern/cycles/device/device_cuda.cpp')
| -rw-r--r-- | intern/cycles/device/device_cuda.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp index 8f11782b168..ec7157aa083 100644 --- a/intern/cycles/device/device_cuda.cpp +++ b/intern/cycles/device/device_cuda.cpp @@ -572,8 +572,11 @@ public: /* get kernel function */ if(progressive) cuda_assert(cuModuleGetFunction(&cuPathTrace, cuModule, "kernel_cuda_path_trace_progressive")) - else + else { cuda_assert(cuModuleGetFunction(&cuPathTrace, cuModule, "kernel_cuda_path_trace_non_progressive")) + if(have_error()) + return; + } /* pass in parameters */ int offset = 0; |