diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-08-29 17:42:32 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-08-29 17:42:32 +0300 |
| commit | fd2615fd9b5ac17a006cb3836ebd58e538517507 (patch) | |
| tree | a12938bf7f09ef36998b199a09efac3a344115c0 /intern | |
| parent | 0d085790d13b2c261210addb12fabc1fea82bdef (diff) | |
| parent | ddf8c49736864fe89348c002fecaacdcb1c28c8e (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/kernel/geom/geom_triangle_intersect.h | 4 | ||||
| -rw-r--r-- | intern/cycles/render/osl.cpp | 1 | ||||
| -rw-r--r-- | intern/cycles/render/osl.h | 1 |
3 files changed, 5 insertions, 1 deletions
diff --git a/intern/cycles/kernel/geom/geom_triangle_intersect.h b/intern/cycles/kernel/geom/geom_triangle_intersect.h index f8c671fed14..aa6b102a0f3 100644 --- a/intern/cycles/kernel/geom/geom_triangle_intersect.h +++ b/intern/cycles/kernel/geom/geom_triangle_intersect.h @@ -70,6 +70,8 @@ ccl_device_inline bool triangle_intersect(KernelGlobals *kg, return false; } +#ifdef __KERNEL_AVX2__ + #define cross256(A,B, C,D) _mm256_fmsub_ps(A,B, _mm256_mul_ps(C,D)) #if defined(__KERNEL_CUDA__) && __CUDA_ARCH__ < 300 ccl_device_inline @@ -542,6 +544,8 @@ int triangle_intersect8(KernelGlobals *kg, return result; } +#endif /* __KERNEL_AVX2__ */ + /* Special ray intersection routines for subsurface scattering. In that case we * only want to intersect with primitives in the same object, and if case of * multiple hits we pick a single random primitive as the intersection point. diff --git a/intern/cycles/render/osl.cpp b/intern/cycles/render/osl.cpp index 2bf69c869b9..496e9d9491a 100644 --- a/intern/cycles/render/osl.cpp +++ b/intern/cycles/render/osl.cpp @@ -28,7 +28,6 @@ #include "kernel/osl/osl_globals.h" #include "kernel/osl/osl_services.h" #include "kernel/osl/osl_shader.h" -#include "OSL/llvm_util.h" #include "util/util_foreach.h" #include "util/util_logging.h" diff --git a/intern/cycles/render/osl.h b/intern/cycles/render/osl.h index 09d1a54d0b9..966fc1965d7 100644 --- a/intern/cycles/render/osl.h +++ b/intern/cycles/render/osl.h @@ -26,6 +26,7 @@ #include "render/shader.h" #ifdef WITH_OSL +#include <OSL/llvm_util.h> #include <OSL/oslcomp.h> #include <OSL/oslexec.h> #include <OSL/oslquery.h> |