diff options
| author | Lukas Toenne <lukas.toenne@googlemail.com> | 2012-09-03 17:56:40 +0400 |
|---|---|---|
| committer | Lukas Toenne <lukas.toenne@googlemail.com> | 2012-09-03 17:56:40 +0400 |
| commit | ad551c1ec669f3b68cd0f2620acc07545fe9d57a (patch) | |
| tree | 33583866160a8a9a2ebae95a4895789307153e17 /intern/cycles/kernel/kernel_types.h | |
| parent | 264975b89c865bd623dea4d360cee8e92052901b (diff) | |
Enable compilation of the SVM backend for Cycles even when OSL is enabled. The switch between SVM/OSL is decided at runtime, so the SVM code cannot simply be ignored when OSL is enabled.
Currently all shader functions check the OSL/SVM flag to dispatch to the appropriate backend. If this turns out to be a significant overhead (unlikely) this test should be moved out of the inner loop.
Diffstat (limited to 'intern/cycles/kernel/kernel_types.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_types.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index 488c6de3a42..39e088583c4 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -382,10 +382,9 @@ typedef struct ShaderClosure { #ifdef __OSL__ void *prim; -#else +#endif float data0; float data1; -#endif } ShaderClosure; |