Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/intern
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2016-09-12 13:48:35 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2016-09-12 13:48:35 +0300
commitfb2c435d8655a4fd37b518dab2da24ef79240822 (patch)
tree2eb924f39173ed0866d62b3ef42519b9e828ae83 /intern
parent91e0a16f2f7592b93bd41319e4099f6cfa183a05 (diff)
Cycles: Fix wrong SSS in combination with hair on AVX2 platform
Not sure why exactly that happened, need a closer look.
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/kernel/kernel_subsurface.h17
1 files changed, 9 insertions, 8 deletions
diff --git a/intern/cycles/kernel/kernel_subsurface.h b/intern/cycles/kernel/kernel_subsurface.h
index ba45eea6388..f03fe288a0c 100644
--- a/intern/cycles/kernel/kernel_subsurface.h
+++ b/intern/cycles/kernel/kernel_subsurface.h
@@ -360,14 +360,15 @@ int subsurface_scatter_multi_intersect(
return num_eval_hits;
}
-ccl_device void subsurface_scatter_multi_setup(KernelGlobals *kg,
- SubsurfaceIntersection* ss_isect,
- int hit,
- ShaderData *sd,
- PathState *state,
- int state_flag,
- ShaderClosure *sc,
- bool all)
+ccl_device_noinline void subsurface_scatter_multi_setup(
+ KernelGlobals *kg,
+ SubsurfaceIntersection* ss_isect,
+ int hit,
+ ShaderData *sd,
+ PathState *state,
+ int state_flag,
+ ShaderClosure *sc,
+ bool all)
{
/* Setup new shading point. */
shader_setup_from_subsurface(kg, sd, &ss_isect->hits[hit], &ss_isect->ray);