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

Fix T48732, OpenCL compile failure after Multiscatter GGX commit.

Browse Source 
Use OpenCL "all" builtin type for conversion, according to OpenCL 1.1 spec 6.3e.
This commit is contained in:
Thomas Dinges
2016-06-25 11:14:06 +02:00
parent 05a60aaa07
commit 99088f8b55
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/closure/bsdf_microfacet_multi.h
View File

@@ -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) 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)) if(sc->T == make_float3(0.0f, 0.0f, 0.0f))
#endif
sc->T = make_float3(1.0f, 0.0f, 0.0f); sc->T = make_float3(1.0f, 0.0f, 0.0f);
return bsdf_microfacet_multi_ggx_common_setup(sc); return bsdf_microfacet_multi_ggx_common_setup(sc);