diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-05-31 20:21:30 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-05-31 20:21:30 +0400 |
| commit | 966e004bbea6304840cd73f262d91a5e65464e5f (patch) | |
| tree | b9d4a9e233e471e2fa143e27b26058d6093c9d56 /intern/cycles/kernel/kernel_globals.h | |
| parent | fc68daff582664bc1ccba57b9408973c5e8d83ec (diff) | |
Cycles: OSL build & image manager fixes.
Diffstat (limited to 'intern/cycles/kernel/kernel_globals.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_globals.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/intern/cycles/kernel/kernel_globals.h b/intern/cycles/kernel/kernel_globals.h index 720a9f28fa1..f37b27cc9f4 100644 --- a/intern/cycles/kernel/kernel_globals.h +++ b/intern/cycles/kernel/kernel_globals.h @@ -18,6 +18,14 @@ /* Constant Globals */ +#ifdef __KERNEL_CPU__ + +#ifdef WITH_OSL +#include "osl_globals.h" +#endif + +#endif + CCL_NAMESPACE_BEGIN /* On the CPU, we pass along the struct KernelGlobals to nearly everywhere in @@ -27,10 +35,6 @@ CCL_NAMESPACE_BEGIN #ifdef __KERNEL_CPU__ -#ifdef WITH_OSL -//#include "osl_globals.h" -#endif - typedef struct KernelGlobals { #define KERNEL_TEX(type, ttype, name) ttype name; @@ -42,7 +46,7 @@ typedef struct KernelGlobals { #ifdef WITH_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; #endif } KernelGLobals; |