Fix cycles baking code build errors with OpenCL on some platforms.

This commit is contained in:
Brecht Van Lommel
2014-05-11 16:36:18 +02:00
parent 0d5ecc5c33
commit df74230c5e
2 changed files with 6 additions and 0 deletions

View File

@@ -411,6 +411,7 @@ ccl_device_inline void path_radiance_accum_sample(PathRadiance *L, PathRadiance
{
float fac = 1.0f/num_samples;
#ifdef __PASSES__
L->direct_diffuse += L_sample->direct_diffuse*fac;
L->direct_glossy += L_sample->direct_glossy*fac;
L->direct_transmission += L_sample->direct_transmission*fac;
@@ -426,6 +427,9 @@ ccl_device_inline void path_radiance_accum_sample(PathRadiance *L, PathRadiance
L->ao += L_sample->ao*fac;
L->shadow += L_sample->shadow*fac;
L->mist += L_sample->mist*fac;
#else
*L += *L_sample * fac;
#endif
}
CCL_NAMESPACE_END

View File

@@ -201,6 +201,7 @@ ccl_device void kernel_bake_evaluate(KernelGlobals *kg, ccl_global uint4 *input,
break;
}
#ifdef __PASSES__
/* light passes */
case SHADER_EVAL_AO:
{
@@ -269,6 +270,7 @@ ccl_device void kernel_bake_evaluate(KernelGlobals *kg, ccl_global uint4 *input,
#endif
break;
}
#endif
/* extra */
case SHADER_EVAL_ENVIRONMENT: