diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-11-25 00:01:30 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-11-25 00:01:53 +0300 |
| commit | 059c119719e04283808d3c7076886e1a58874f6b (patch) | |
| tree | 5296776b81111ef62e33687d4a9b4c6ab5e297ff /intern/cycles/kernel | |
| parent | fa0fcbe4d6ca3f183f02395fe9ba18fb5ea87748 (diff) | |
| parent | e742e0934de6384eeaf271ca4cfe99922ddbe3fb (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/kernel')
| -rw-r--r-- | intern/cycles/kernel/bvh/bvh_embree.h | 2 | ||||
| -rw-r--r-- | intern/cycles/kernel/geom/geom_triangle_intersect.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/kernel/bvh/bvh_embree.h b/intern/cycles/kernel/bvh/bvh_embree.h index 34a099ebb4d..bfc911a1e76 100644 --- a/intern/cycles/kernel/bvh/bvh_embree.h +++ b/intern/cycles/kernel/bvh/bvh_embree.h @@ -30,7 +30,7 @@ struct CCLIntersectContext { RAY_SHADOW_ALL = 1, RAY_SSS = 2, RAY_VOLUME_ALL = 3, - + } RayType; KernelGlobals *kg; diff --git a/intern/cycles/kernel/geom/geom_triangle_intersect.h b/intern/cycles/kernel/geom/geom_triangle_intersect.h index 57f4c86d403..56dbc4473fa 100644 --- a/intern/cycles/kernel/geom/geom_triangle_intersect.h +++ b/intern/cycles/kernel/geom/geom_triangle_intersect.h @@ -210,7 +210,7 @@ ccl_device_inline int ray_triangle_intersect8( unsigned char mask_sign_T = _mm256_movemask_ps(sign_T_256); if(((mask_minmaxUVW_pos | mask_sign_T) & prim_num_mask) == prim_num_mask) { return false; - } + } __m256 xor_signmask_256 = _mm256_castsi256_ps(_mm256_xor_si256(_mm256_castps_si256(den_256), sign_den_256)); |