diff options
Diffstat (limited to 'intern/cycles/kernel/kernel_globals.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_globals.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/intern/cycles/kernel/kernel_globals.h b/intern/cycles/kernel/kernel_globals.h index 1e56c11ab90..529b7b8768f 100644 --- a/intern/cycles/kernel/kernel_globals.h +++ b/intern/cycles/kernel/kernel_globals.h @@ -18,14 +18,6 @@ /* Constant Globals */ -#ifdef __KERNEL_CPU__ - -#ifdef __OSL__ -#include "osl_globals.h" -#endif - -#endif - CCL_NAMESPACE_BEGIN /* On the CPU, we pass along the struct KernelGlobals to nearly everywhere in @@ -35,6 +27,12 @@ CCL_NAMESPACE_BEGIN #ifdef __KERNEL_CPU__ +#ifdef __OSL__ +struct OSLGlobals; +struct OSLThreadData; +struct OSLShadingSystem; +#endif + #define MAX_BYTE_IMAGES 512 #define MAX_FLOAT_IMAGES 5 @@ -51,7 +49,9 @@ typedef struct KernelGlobals { #ifdef __OSL__ /* On the CPU, we also have the OSL globals here. Most data structures are shared * with SVM, the difference is in the shaders and object/mesh attributes. */ - OSLGlobals osl; + OSLGlobals *osl; + OSLShadingSystem *osl_ss; + OSLThreadData *osl_tdata; #endif } KernelGlobals; |