Cycles: Cleanup, remove residue of previous split kernel data
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 8 Mar 2017 09:26:29 +0000 (10:26 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 8 Mar 2017 09:26:29 +0000 (10:26 +0100)
This is all in split data state array.

intern/cycles/device/opencl/opencl_split.cpp
intern/cycles/kernel/kernel_globals.h

index be931599e390857e60fe013a08aebd6ecee17827..aadd9f778b5387da493e24fbd41a85209e857f8c 100644 (file)
@@ -114,8 +114,6 @@ public:
                                ccl_global type *name;
 #include "kernel_textures.h"
 #undef KERNEL_TEX
                                ccl_global type *name;
 #include "kernel_textures.h"
 #undef KERNEL_TEX
-                               void *sd_input;
-                               void *isect_shadow;
                                SplitData split_data;
                                SplitParams split_param_data;
                        } KernelGlobals;
                                SplitData split_data;
                                SplitParams split_param_data;
                        } KernelGlobals;
index 5dbea4481a3862477224e7fc74955b052498f327..12d35787462860d544064a24f05c9c29559597dd 100644 (file)
@@ -110,8 +110,6 @@ typedef ccl_addr_space struct KernelGlobals {
 #  include "kernel_textures.h"
 
 #  ifdef __SPLIT_KERNEL__
 #  include "kernel_textures.h"
 
 #  ifdef __SPLIT_KERNEL__
-       ShaderData *sd_input;
-       Intersection *isect_shadow;
        SplitData split_data;
        SplitParams split_param_data;
 #  endif
        SplitData split_data;
        SplitParams split_param_data;
 #  endif