[Bf-blender-cvs] [df74230] master: Fix cycles baking code build errors with OpenCL on some platforms.

[Brecht Van Lommel]

Commit: df74230c5e32253b9abd136dca071947d6f0b891
Author: Brecht Van Lommel
Date:   Sun May 11 16:36:18 2014 +0200
https://developer.blender.org/rBdf74230c5e32253b9abd136dca071947d6f0b891

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

===================================================================

M	intern/cycles/kernel/kernel_accumulate.h
M	intern/cycles/kernel/kernel_displace.h

===================================================================

diff --git a/intern/cycles/kernel/kernel_accumulate.h b/intern/cycles/kernel/kernel_accumulate.h
index 82450b7..b4f6dcd 100644
--- a/intern/cycles/kernel/kernel_accumulate.h
+++ b/intern/cycles/kernel/kernel_accumulate.h
@@ -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
diff --git a/intern/cycles/kernel/kernel_displace.h b/intern/cycles/kernel/kernel_displace.h
index 4727e90..b8c64af 100644
--- a/intern/cycles/kernel/kernel_displace.h
+++ b/intern/cycles/kernel/kernel_displace.h
@@ -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: