[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53791] trunk/blender/intern/cycles/kernel : Change some big functions from __device_inline to __device, which

[Sergey Sharybin]

Revision: 53791
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53791
Author:   nazgul
Date:     2013-01-14 17:30:20 +0000 (Mon, 14 Jan 2013)
Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/intern/cycles/kernel/kernel_bvh.h
    trunk/blender/intern/cycles/kernel/kernel_shader.h

Modified: trunk/blender/intern/cycles/kernel/kernel_bvh.h
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_bvh.h	2013-01-14 16:42:43 UTC (rev 53790)
+++ trunk/blender/intern/cycles/kernel/kernel_bvh.h	2013-01-14 17:30:20 UTC (rev 53791)
@@ -344,7 +344,7 @@
 }
 #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 @@
 }
 
 #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];

Modified: trunk/blender/intern/cycles/kernel/kernel_shader.h
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_shader.h	2013-01-14 16:42:43 UTC (rev 53790)
+++ trunk/blender/intern/cycles/kernel/kernel_shader.h	2013-01-14 17:30:20 UTC (rev 53791)
@@ -53,7 +53,7 @@
 }
 #endif
 
-__device_inline void shader_setup_from_ray(KernelGlobals *kg, ShaderData *sd,
+__device void shader_setup_from_ray(KernelGlobals *kg, ShaderData *sd,
 	const Intersection *isect, const Ray *ray)
 {
 #ifdef __INSTANCING__