Cycles: Restructure kernel files organization

Since the kernel split work we're now having quite a few of new files, majority
of which are related on the kernel entry points. Keeping those files in the
root kernel folder will eventually make it really hard to follow which files are
actual implementation of Cycles kernel.

Those files are now moved to kernel/kernels/<device_type>. This way adding extra
entry points will be less noisy. It is also nice to have all device-specific
files grouped together.

Another change is in the way how split kernel invokes logic. Previously all the
logic was implemented directly in the .cl files, which makes it a bit tricky to
re-use the logic across other devices. Since we'll likely be looking into doing
same split work for CUDA devices eventually it makes sense to move logic from
.cl files to header files. Those files are stored in kernel/split. This does not
mean the header files will not give error messages when tried to be included
from other devices and their arguments will likely be changed, but having such
separation is a good start anyway.

There should be no functional changes.

Reviewers: juicyfruit, dingto

Differential Revision: https://developer.blender.org/D1314

1 files changed, 52 insertions, 0 deletions

diff --git a/intern/cycles/kernel/kernels/opencl/kernel_lamp_emission.cl b/intern/cycles/kernel/kernels/opencl/kernel_lamp_emission.cl
new file mode 100644
index 00000000000..af83e68b53e
--- /dev/null
+++ b/intern/cycles/kernel/kernels/opencl/kernel_lamp_emission.cl
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2011-2015 Blender Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "split/kernel_lamp_emission.h"
+
+__kernel void kernel_ocl_path_trace_lamp_emission(
+	ccl_global char *globals,
+	ccl_constant KernelData *data,
+	ccl_global char *shader_data,               /* Required for lamp emission */
+	ccl_global float3 *throughput_coop,         /* Required for lamp emission */
+	PathRadiance *PathRadiance_coop, /* Required for lamp emission */
+	ccl_global Ray *Ray_coop,                   /* Required for lamp emission */
+	ccl_global PathState *PathState_coop,       /* Required for lamp emission */
+	Intersection *Intersection_coop, /* Required for lamp emission */
+	ccl_global char *ray_state,                 /* Denotes the state of each ray */
+	int sw, int sh,
+	ccl_global int *Queue_data,                 /* Memory for queues */
+	ccl_global int *Queue_index,                /* Tracks the number of elements in queues */
+	int queuesize,                              /* Size (capacity) of queues */
+	ccl_global char *use_queues_flag,           /* used to decide if this kernel should use queues to fetch ray index */
+	int parallel_samples                        /* Number of samples to be processed in parallel */
+	)
+{
+	kernel_lamp_emission(globals,
+	                     data,
+	                     shader_data,
+	                     throughput_coop,
+	                     PathRadiance_coop,
+	                     Ray_coop,
+	                     PathState_coop,
+	                     Intersection_coop,
+	                     ray_state,
+	                     sw, sh,
+	                     Queue_data,
+	                     Queue_index,
+	                     queuesize,
+	                     use_queues_flag,
+	                     parallel_samples);
+}