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/osl/osl_shader.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/osl/osl_shader.h')
| -rw-r--r-- | intern/cycles/kernel/osl/osl_shader.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/intern/cycles/kernel/osl/osl_shader.h b/intern/cycles/kernel/osl/osl_shader.h index a888335aad6..815557ed203 100644 --- a/intern/cycles/kernel/osl/osl_shader.h +++ b/intern/cycles/kernel/osl/osl_shader.h @@ -77,6 +77,9 @@ public: static float3 volume_eval_phase(const ShaderData *sd, const ShaderClosure *sc, const float3 omega_in, const float3 omega_out); + + /* release */ + static void release(KernelGlobals *kg, const ShaderData *sd); }; CCL_NAMESPACE_END |