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

Cycles: Commit file missing from conditionally compiling baking kernel

Browse Source
This commit is contained in:
Sergey Sharybin
2015-07-18 16:26:41 +02:00
parent cf14437ac9
commit 2ccfbf2f81
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
intern/cycles/kernel/kernels/opencl/kernel.cl
View File

@@ -104,13 +104,7 @@ __kernel void kernel_ocl_bake(
int x = sx + get_global_id(0); int x = sx + get_global_id(0);
if(x < sx + sw) { if(x < sx + sw) {
#if defined(__KERNEL_OPENCL_NVIDIA__) && __COMPUTE_CAPABILITY__ < 300 #ifdef __NO_BAKING__
/* NVidia compiler is spending infinite amount of time trying
* to deal with kernel_bake_evaluate() on architectures prior
* to sm_30.
* For now we disable baking kernel for those devices, so at
* least rendering with split kernel could be compiled.
*/
output[x] = make_float4(0.0f, 0.0f, 0.0f, 0.0f); output[x] = make_float4(0.0f, 0.0f, 0.0f, 0.0f);
#else #else
kernel_bake_evaluate(kg, input, output, (ShaderEvalType)type, x, offset, sample); kernel_bake_evaluate(kg, input, output, (ShaderEvalType)type, x, offset, sample);