[Bf-blender-cvs] [211ae5a] cycles_kernel_split: Cycles kernel split : Refactor: move atomic_add_float utility function to appropriate place in kernel_split.h

[Kavitha Sampath]

Commit: 211ae5ab772774d7d81017fa297c9ce628db3380
Author: Kavitha Sampath
Date:   Wed May 6 15:16:07 2015 +0530
Branches: cycles_kernel_split
https://developer.blender.org/rB211ae5ab772774d7d81017fa297c9ce628db3380

Cycles kernel split : Refactor: move atomic_add_float utility function to appropriate place in kernel_split.h

===================================================================

M	intern/cycles/kernel/kernel_split.h

===================================================================

diff --git a/intern/cycles/kernel/kernel_split.h b/intern/cycles/kernel/kernel_split.h
index 5b91276..c20fc52 100644
--- a/intern/cycles/kernel/kernel_split.h
+++ b/intern/cycles/kernel/kernel_split.h
@@ -22,22 +22,6 @@
 #include "kernel_types.h"
 #include "kernel_globals.h"
 
-#ifdef __OSL__
-#include "osl_shader.h"
-#endif
-
-#include "kernel_random.h"
-#include "kernel_projection.h"
-#include "kernel_montecarlo.h"
-#include "kernel_differential.h"
-#include "kernel_camera.h"
-
-#include "geom/geom.h"
-
-#include "kernel_accumulate.h"
-#include "kernel_shader.h"
-#include "kernel_light.h"
-
 /* atomic_add_float function should be defined prior to its usage in kernel_passes.h */
 #if defined(__SPLIT_KERNEL__) && defined(__WORK_STEALING__)
 /* Utility functions for float atomics */
@@ -61,6 +45,21 @@ ccl_device_inline void atomic_add_float(volatile ccl_global float *source, const
 }
 #endif // __SPLIT_KERNEL__ && __WORK_STEALING__
 
+#ifdef __OSL__
+#include "osl_shader.h"
+#endif
+
+#include "kernel_random.h"
+#include "kernel_projection.h"
+#include "kernel_montecarlo.h"
+#include "kernel_differential.h"
+#include "kernel_camera.h"
+
+#include "geom/geom.h"
+
+#include "kernel_accumulate.h"
+#include "kernel_shader.h"
+#include "kernel_light.h"
 #include "kernel_passes.h"
 
 #ifdef __SUBSURFACE__