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

Fix Cycles CUDA adaptive megakernel build error.

Browse Source
This commit is contained in:
Brecht Van Lommel
2017-08-05 15:46:40 +02:00
parent f5f6f9c9ac
commit 2a74f36dac
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -100,6 +100,8 @@ ccl_device_noinline void kernel_path_ao(KernelGlobals *kg,
#ifndef __SPLIT_KERNEL__ #ifndef __SPLIT_KERNEL__
#if defined(__BRANCHED_PATH__) || defined(__BAKING__)
ccl_device void kernel_path_indirect(KernelGlobals *kg, ccl_device void kernel_path_indirect(KernelGlobals *kg,
ShaderData *sd, ShaderData *sd,
ShaderData *emission_sd, ShaderData *emission_sd,
@@ -428,6 +430,7 @@ ccl_device void kernel_path_indirect(KernelGlobals *kg,
} }
} }
#endif /* defined(__BRANCHED_PATH__) || defined(__BAKING__) */
ccl_device_inline float kernel_path_integrate(KernelGlobals *kg, ccl_device_inline float kernel_path_integrate(KernelGlobals *kg,
RNG *rng, RNG *rng,