Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cycles:

Browse Source 
* 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.
This commit is contained in:
Thomas Dinges
2013-08-09 20:03:49 +00:00
parent be7b4e26b1
commit 743a7a4a4b
6 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
intern/cycles/kernel/kernel_path.h
View File

@@ -1194,6 +1194,7 @@ __device void kernel_path_trace_progressive(KernelGlobals *kg,
path_rng_end(kg, rng_state, rng);
}
#ifdef __NON_PROGRESSIVE__
__device void kernel_path_trace_non_progressive(KernelGlobals *kg,
__global float *buffer, __global uint *rng_state,
int sample, int x, int y, int offset, int stride)
@@ -1215,11 +1216,7 @@ __device void kernel_path_trace_non_progressive(KernelGlobals *kg,
float4 L;
if (ray.t != 0.0f)
#ifdef __NON_PROGRESSIVE__
L = kernel_path_non_progressive(kg, &rng, sample, ray, buffer);
#else
L = kernel_path_progressive(kg, &rng, sample, ray, buffer);
#endif
else
L = make_float4(0.0f, 0.0f, 0.0f, 0.0f);
@@ -1228,6 +1225,7 @@ __device void kernel_path_trace_non_progressive(KernelGlobals *kg,
path_rng_end(kg, rng_state, rng);
}
#endif
CCL_NAMESPACE_END