[Bf-blender-cvs] [ef7c36f5ed] master: Cycles: Cleanup, remove residue of previous split kernel data

[Sergey Sharybin]

Commit: ef7c36f5edf00bad99d5897758d780ae48cde6f3
Author: Sergey Sharybin
Date:   Wed Mar 8 10:26:29 2017 +0100
Branches: master
https://developer.blender.org/rBef7c36f5edf00bad99d5897758d780ae48cde6f3

Cycles: Cleanup, remove residue of previous split kernel data

This is all in split data state array.

===================================================================

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

===================================================================

diff --git a/intern/cycles/device/opencl/opencl_split.cpp b/intern/cycles/device/opencl/opencl_split.cpp
index be931599e3..aadd9f778b 100644
--- a/intern/cycles/device/opencl/opencl_split.cpp
+++ b/intern/cycles/device/opencl/opencl_split.cpp
@@ -114,8 +114,6 @@ public:
 				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;
diff --git a/intern/cycles/kernel/kernel_globals.h b/intern/cycles/kernel/kernel_globals.h
index 5dbea4481a..12d3578746 100644
--- a/intern/cycles/kernel/kernel_globals.h
+++ b/intern/cycles/kernel/kernel_globals.h
@@ -110,8 +110,6 @@ typedef ccl_addr_space struct KernelGlobals {
 #  include "kernel_textures.h"
 
 #  ifdef __SPLIT_KERNEL__
-	ShaderData *sd_input;
-	Intersection *isect_shadow;
 	SplitData split_data;
 	SplitParams split_param_data;
 #  endif