Cycles: Correction to previous commit
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 5 Aug 2016 10:16:24 +0000 (12:16 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 5 Aug 2016 10:16:24 +0000 (12:16 +0200)
The change didn't fix difference render result on CUDA as i've hoped,
so reverting change for GPU rendering for now.

Sorry for the noise.

intern/cycles/kernel/kernel_subsurface.h

index 5e2754b440b898541321632a08669ce6894cf23f..ba45eea6388cf33c96a87fc86198a803e9bda95c 100644 (file)
@@ -85,11 +85,16 @@ ccl_device ShaderClosure *subsurface_scatter_pick_closure(KernelGlobals *kg, Sha
        return NULL;
 }
 
-ccl_device_noinline float3 subsurface_scatter_eval(ShaderData *sd,
-                                                   ShaderClosure *sc,
-                                                   float disk_r,
-                                                   float r,
-                                                   bool all)
+#ifndef __KERNEL_GPU__
+ccl_device_noinline
+#else
+ccl_device_inline
+#endif
+float3 subsurface_scatter_eval(ShaderData *sd,
+                               ShaderClosure *sc,
+                               float disk_r,
+                               float r,
+                               bool all)
 {
 #ifdef BSSRDF_MULTI_EVAL
        /* this is the veach one-sample model with balance heuristic, some pdf