[Bf-blender-cvs] [90eb84b080] cycles_split_kernel: Cycles: Dont use array indexing for non array

[Mai Lavelle]

Commit: 90eb84b080bfaf871b57bf7b7392fa9ac02a3496
Author: Mai Lavelle
Date:   Fri Jan 6 03:11:46 2017 -0500
Branches: cycles_split_kernel
https://developer.blender.org/rB90eb84b080bfaf871b57bf7b7392fa9ac02a3496

Cycles: Dont use array indexing for non array

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

M	intern/cycles/kernel/split/kernel_data_init.h
M	intern/cycles/kernel/split/kernel_lamp_emission.h
M	intern/cycles/kernel/split/kernel_next_iteration_setup.h
M	intern/cycles/kernel/split/kernel_scene_intersect.h

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

diff --git a/intern/cycles/kernel/split/kernel_data_init.h b/intern/cycles/kernel/split/kernel_data_init.h
index 6a050ddcc9..af4cfd9d73 100644
--- a/intern/cycles/kernel/split/kernel_data_init.h
+++ b/intern/cycles/kernel/split/kernel_data_init.h
@@ -164,7 +164,7 @@ void KERNEL_FUNCTION_FULL_NAME(data_init)(
 		/* The scene-intersect kernel should not use the queues very first time.
 		 * since the queue would be empty.
 		 */
-		use_queues_flag[0] = 0;
+		*use_queues_flag = 0;
 	}
 
 	int x = ccl_global_id(0);
diff --git a/intern/cycles/kernel/split/kernel_lamp_emission.h b/intern/cycles/kernel/split/kernel_lamp_emission.h
index 802f01c9ef..dd5005946f 100644
--- a/intern/cycles/kernel/split/kernel_lamp_emission.h
+++ b/intern/cycles/kernel/split/kernel_lamp_emission.h
@@ -48,7 +48,7 @@ ccl_device void kernel_lamp_emission(KernelGlobals *kg)
 	/* Fetch use_queues_flag. */
 	ccl_local char local_use_queues_flag;
 	if(ccl_local_id(0) == 0 && ccl_local_id(1) == 0) {
-		local_use_queues_flag = kernel_split_params.use_queues_flag[0];
+		local_use_queues_flag = *kernel_split_params.use_queues_flag;
 	}
 	ccl_barrier(CCL_LOCAL_MEM_FENCE);
 
diff --git a/intern/cycles/kernel/split/kernel_next_iteration_setup.h b/intern/cycles/kernel/split/kernel_next_iteration_setup.h
index 62e6fded3b..0ff8286e59 100644
--- a/intern/cycles/kernel/split/kernel_next_iteration_setup.h
+++ b/intern/cycles/kernel/split/kernel_next_iteration_setup.h
@@ -72,7 +72,7 @@ ccl_device void kernel_next_iteration_setup(KernelGlobals *kg)
 		* has already been executed atleast once. From the next time,
 		* scene-intersect kernel may operate on queues to fetch ray index
 		*/
-		kernel_split_params.use_queues_flag[0] = 1;
+		*kernel_split_params.use_queues_flag = 1;
 
 		/* Mark queue indices of QUEUE_SHADOW_RAY_CAST_AO_RAYS and
 		 * QUEUE_SHADOW_RAY_CAST_DL_RAYS queues that were made empty during the
diff --git a/intern/cycles/kernel/split/kernel_scene_intersect.h b/intern/cycles/kernel/split/kernel_scene_intersect.h
index d0d77b22bb..23696ee57e 100644
--- a/intern/cycles/kernel/split/kernel_scene_intersect.h
+++ b/intern/cycles/kernel/split/kernel_scene_intersect.h
@@ -69,7 +69,7 @@ ccl_device void kernel_scene_intersect(KernelGlobals *kg)
 	/* Fetch use_queues_flag */
 	ccl_local char local_use_queues_flag;
 	if(ccl_local_id(0) == 0 && ccl_local_id(1) == 0) {
-		local_use_queues_flag = kernel_split_params.use_queues_flag[0];
+		local_use_queues_flag = *kernel_split_params.use_queues_flag;
 	}
 	ccl_barrier(CCL_LOCAL_MEM_FENCE);