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

Fix CUDA compile after last commit.

Browse Source
This commit is contained in:
Brecht Van Lommel
2013-01-15 20:13:19 +00:00
parent 3373b8154b
commit 486abf01c6
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
intern/cycles/kernel/kernel_accumulate.h
View File

@@ -272,6 +272,7 @@ __device_inline void path_radiance_accum_background(PathRadiance *L, float3 thro
__device_inline void path_radiance_sum_indirect(PathRadiance *L) __device_inline void path_radiance_sum_indirect(PathRadiance *L)
{ {
#ifdef __PASSES__
/* this division is a bit ugly, but means we only have to keep track of /* this division is a bit ugly, but means we only have to keep track of
* only a single throughput further along the path, here we recover just * only a single throughput further along the path, here we recover just
* the indirect parth that is not influenced by any particular BSDF type */ * the indirect parth that is not influenced by any particular BSDF type */
@@ -286,10 +287,12 @@ __device_inline void path_radiance_sum_indirect(PathRadiance *L)
L->indirect_glossy += L->path_glossy*L->indirect; L->indirect_glossy += L->path_glossy*L->indirect;
L->indirect_transmission += L->path_transmission*L->indirect; L->indirect_transmission += L->path_transmission*L->indirect;
} }
#endif
} }
__device_inline void path_radiance_reset_indirect(PathRadiance *L) __device_inline void path_radiance_reset_indirect(PathRadiance *L)
{ {
#ifdef __PASSES__
if(L->use_light_pass) { if(L->use_light_pass) {
L->path_diffuse = make_float3(0.0f, 0.0f, 0.0f); L->path_diffuse = make_float3(0.0f, 0.0f, 0.0f);
L->path_glossy = make_float3(0.0f, 0.0f, 0.0f); L->path_glossy = make_float3(0.0f, 0.0f, 0.0f);
@@ -298,6 +301,7 @@ __device_inline void path_radiance_reset_indirect(PathRadiance *L)
L->direct_emission = make_float3(0.0f, 0.0f, 0.0f); L->direct_emission = make_float3(0.0f, 0.0f, 0.0f);
L->indirect = make_float3(0.0f, 0.0f, 0.0f); L->indirect = make_float3(0.0f, 0.0f, 0.0f);
} }
#endif
} }
__device_inline float3 path_radiance_sum(KernelGlobals *kg, PathRadiance *L) __device_inline float3 path_radiance_sum(KernelGlobals *kg, PathRadiance *L)