diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-01-14 21:30:20 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-01-14 21:30:20 +0400 |
| commit | 36f44c6e02a5e35bb4572f232b867bb055dbb2d8 (patch) | |
| tree | 57dc94db0c9116197c17a20af8043c60ba537204 /intern/cycles/kernel/kernel_bvh.h | |
| parent | b27854bd47104300a484e3b06185b2cb1fa0b774 (diff) | |
Change some big functions from __device_inline to __device, which
makes CPU kernel compilation much faster when using MSVC.
Sideeffect of this change is that CPU rendering is few percent
faster now. CUDA rendering is the same speed.
Diffstat (limited to 'intern/cycles/kernel/kernel_bvh.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_bvh.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/kernel/kernel_bvh.h b/intern/cycles/kernel/kernel_bvh.h index 2cb29207b05..6d770041b26 100644 --- a/intern/cycles/kernel/kernel_bvh.h +++ b/intern/cycles/kernel/kernel_bvh.h @@ -344,7 +344,7 @@ __device_inline void bvh_curve_intersect(KernelGlobals *kg, Intersection *isect, } #endif -__device_inline bool bvh_intersect(KernelGlobals *kg, const Ray *ray, const uint visibility, Intersection *isect) +__device bool bvh_intersect(KernelGlobals *kg, const Ray *ray, const uint visibility, Intersection *isect) { /* traversal stack in CUDA thread-local memory */ int traversalStack[BVH_STACK_SIZE]; @@ -470,7 +470,7 @@ __device_inline bool bvh_intersect(KernelGlobals *kg, const Ray *ray, const uint } #ifdef __OBJECT_MOTION__ -__device_inline bool bvh_intersect_motion(KernelGlobals *kg, const Ray *ray, const uint visibility, Intersection *isect) +__device bool bvh_intersect_motion(KernelGlobals *kg, const Ray *ray, const uint visibility, Intersection *isect) { /* traversal stack in CUDA thread-local memory */ int traversalStack[BVH_STACK_SIZE]; |