Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2016-01-14 17:58:22 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2016-01-28 20:59:27 +0300
commite2161ca854da03bae8c17c7cfac6dbcd9d62f33b (patch)
tree6e5a2e0afc4fca9ae226dce79caefad82cc5b07a /intern/cycles/kernel/kernel_globals.h
parent53ef03d20f5ce1dc0c6cb49c759f0be3f467340f (diff)
Cycles: Remove few function arguments needed only for the split kernel
Use KernelGlobals to access all the global arrays for the intermediate storage instead of passing all this storage things explicitly. Tested here with Intel OpenCL, NVIDIA GTX580 and AMD Fiji, didn't see any artifacts, so guess it's all good. Reviewers: juicyfruit, dingto, lukasstockner97 Differential Revision: https://developer.blender.org/D1736
Diffstat (limited to 'intern/cycles/kernel/kernel_globals.h')
-rw-r--r--intern/cycles/kernel/kernel_globals.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/intern/cycles/kernel/kernel_globals.h b/intern/cycles/kernel/kernel_globals.h
index 17fa18909c4..49f6122f3f4 100644
--- a/intern/cycles/kernel/kernel_globals.h
+++ b/intern/cycles/kernel/kernel_globals.h
@@ -86,6 +86,11 @@ typedef ccl_addr_space struct KernelGlobals {
#define KERNEL_TEX(type, ttype, name) \
ccl_global type *name;
#include "kernel_textures.h"
+
+#ifdef __SPLIT_KERNEL__
+ ShaderData *sd_input;
+ Intersection *isect_shadow;
+#endif
} KernelGlobals;
#endif