Blender Git Commit Log
Git Commits -> Revision 95b85a8
Revision 95b85a8 by Lukas Toenne (master) September 4, 2012, 17:28 (GMT) |
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. |
Commit Details:
Full Hash: 95b85a8c37b71c7582d799c2a3177e7f5549f20c
SVN Revision: 50394
Parent Commit: 927b7ed
Lines Changed: +32, -7
6 Modified Paths:
/intern/cycles/kernel/kernel_emission.h (+3, -0) (Diff)
/intern/cycles/kernel/kernel_path.h (+5, -0) (Diff)
/intern/cycles/kernel/kernel_shader.h (+10, -0) (Diff)
/intern/cycles/kernel/osl/osl_globals.h (+0, -1) (Diff)
/intern/cycles/kernel/osl/osl_shader.cpp (+11, -6) (Diff)
/intern/cycles/kernel/osl/osl_shader.h (+3, -0) (Diff)
/intern/cycles/kernel/kernel_path.h (+5, -0) (Diff)
/intern/cycles/kernel/kernel_shader.h (+10, -0) (Diff)
/intern/cycles/kernel/osl/osl_globals.h (+0, -1) (Diff)
/intern/cycles/kernel/osl/osl_shader.cpp (+11, -6) (Diff)
/intern/cycles/kernel/osl/osl_shader.h (+3, -0) (Diff)