Revert "Use one context per OSL thread. Not sure if this actually works, but the...
authorLukas Toenne <lukas.toenne@googlemail.com>
Tue, 4 Sep 2012 17:28:36 +0000 (17:28 +0000)
committerLukas Toenne <lukas.toenne@googlemail.com>
Tue, 4 Sep 2012 17:28:36 +0000 (17:28 +0000)
commit95b85a8c37b71c7582d799c2a3177e7f5549f20c
tree60d4a23d7366589f772f410cc057bdcd27f09fa7
parent927b7ed303358e4a7ad9876efd7b18ca08c6781d
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.
intern/cycles/kernel/kernel_emission.h
intern/cycles/kernel/kernel_path.h
intern/cycles/kernel/kernel_shader.h
intern/cycles/kernel/osl/osl_globals.h
intern/cycles/kernel/osl/osl_shader.cpp
intern/cycles/kernel/osl/osl_shader.h