diff options
| author | Lukas Toenne <lukas.toenne@googlemail.com> | 2012-09-04 21:28:36 +0400 |
|---|---|---|
| committer | Lukas Toenne <lukas.toenne@googlemail.com> | 2012-09-04 21:28:36 +0400 |
| commit | 95b85a8c37b71c7582d799c2a3177e7f5549f20c (patch) | |
| tree | 60d4a23d7366589f772f410cc057bdcd27f09fa7 /intern/cycles/kernel/kernel_emission.h | |
| parent | 927b7ed303358e4a7ad9876efd7b18ca08c6781d (diff) | |
Revert "Use one context per OSL thread. Not sure if this actually works, but the simple renderer example in OSL does it this way."
This does not actually work: The context must not be shared between threads, but using the same context between different samples actually seems to prevent OSL from switching between shaders. The proper solution would be to ensure memory pooling works correctly.
This reverts commit 69f87e69258d6266dcb20f09f7e3d4021e663432.
Diffstat (limited to 'intern/cycles/kernel/kernel_emission.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_emission.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/intern/cycles/kernel/kernel_emission.h b/intern/cycles/kernel/kernel_emission.h index 9032d7d4a41..53d53b4bedd 100644 --- a/intern/cycles/kernel/kernel_emission.h +++ b/intern/cycles/kernel/kernel_emission.h @@ -54,6 +54,8 @@ __device float3 direct_emissive_eval(KernelGlobals *kg, float rando, eval = make_float3(0.0f, 0.0f, 0.0f); } + shader_release(kg, &sd); + return eval; } @@ -162,6 +164,7 @@ __device float3 indirect_background(KernelGlobals *kg, Ray *ray, int path_flag, ShaderData sd; shader_setup_from_background(kg, &sd, ray); float3 L = shader_eval_background(kg, &sd, path_flag); + shader_release(kg, &sd); #ifdef __BACKGROUND_MIS__ /* check if background light exists or if we should skip pdf */ |