diff options
| author | Lukas Stockner <lukas.stockner@freenet.de> | 2016-07-17 20:24:53 +0300 |
|---|---|---|
| committer | Lukas Stockner <lukas.stockner@freenet.de> | 2016-07-17 20:24:53 +0300 |
| commit | a2c82f5e5dfe8ca31861c6e20757c1b614530599 (patch) | |
| tree | bffb63c5db45030614d21b33595f24c932728ed2 /intern | |
| parent | c974def837977f8c936a96c4c538968f99bfd8fb (diff) | |
Cycles: Fix OpenCL compilation after the recent numerical fixes
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/kernel/closure/bsdf_microfacet_multi.h | 6 | ||||
| -rw-r--r-- | intern/cycles/kernel/svm/svm_tex_coord.h | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/intern/cycles/kernel/closure/bsdf_microfacet_multi.h b/intern/cycles/kernel/closure/bsdf_microfacet_multi.h index 6060d7d8ccb..51b12fe4e45 100644 --- a/intern/cycles/kernel/closure/bsdf_microfacet_multi.h +++ b/intern/cycles/kernel/closure/bsdf_microfacet_multi.h @@ -348,11 +348,7 @@ 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 + if(is_zero(sc->T)) sc->T = make_float3(1.0f, 0.0f, 0.0f); return bsdf_microfacet_multi_ggx_common_setup(sc); diff --git a/intern/cycles/kernel/svm/svm_tex_coord.h b/intern/cycles/kernel/svm/svm_tex_coord.h index 0bac8362011..276b6f26f5e 100644 --- a/intern/cycles/kernel/svm/svm_tex_coord.h +++ b/intern/cycles/kernel/svm/svm_tex_coord.h @@ -340,7 +340,7 @@ ccl_device void svm_node_normal_map(KernelGlobals *kg, ShaderData *sd, float *st N = safe_normalize(ccl_fetch(sd, N) + (N - ccl_fetch(sd, N))*strength); } - if(N == make_float3(0.0f, 0.0f, 0.0f)) { + if(is_zero(N)) { N = ccl_fetch(sd, N); } |