[Bf-blender-cvs] [99088f8] master: Fix T48732, OpenCL compile failure after Multiscatter GGX commit.
Thomas Dinges
noreply at git.blender.org
Sat Jun 25 11:16:48 CEST 2016
Commit: 99088f8b552ccbdff5834a060a2a2e032e25f0b5
Author: Thomas Dinges
Date: Sat Jun 25 11:14:06 2016 +0200
Branches: master
https://developer.blender.org/rB99088f8b552ccbdff5834a060a2a2e032e25f0b5
Fix T48732, OpenCL compile failure after Multiscatter GGX commit.
Use OpenCL "all" builtin type for conversion, according to OpenCL 1.1 spec 6.3e.
===================================================================
M intern/cycles/kernel/closure/bsdf_microfacet_multi.h
===================================================================
diff --git a/intern/cycles/kernel/closure/bsdf_microfacet_multi.h b/intern/cycles/kernel/closure/bsdf_microfacet_multi.h
index 21fbfa9..b6c2494 100644
--- a/intern/cycles/kernel/closure/bsdf_microfacet_multi.h
+++ b/intern/cycles/kernel/closure/bsdf_microfacet_multi.h
@@ -348,7 +348,11 @@ ccl_device int bsdf_microfacet_multi_ggx_common_setup(ShaderClosure *sc)
ccl_device int bsdf_microfacet_multi_ggx_aniso_setup(ShaderClosure *sc)
{
+#ifdef __KERNEL_OPENCL__
+ if(all(sc->T == 0.0f))
+#else
if(sc->T == make_float3(0.0f, 0.0f, 0.0f))
+#endif
sc->T = make_float3(1.0f, 0.0f, 0.0f);
return bsdf_microfacet_multi_ggx_common_setup(sc);
More information about the Bf-blender-cvs
mailing list