[Bf-blender-cvs] [e609f5e] cycles_kernel_split: Cycles kernel split: Cleanup some style and unused header

[Sergey Sharybin]

Commit: e609f5e12bec5597c9bba3066d9a046cda1b21c9
Author: Sergey Sharybin
Date:   Sat May 9 18:44:01 2015 +0500
Branches: cycles_kernel_split
https://developer.blender.org/rBe609f5e12bec5597c9bba3066d9a046cda1b21c9

Cycles kernel split: Cleanup some style and unused header

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

M	intern/cycles/device/device.h
M	intern/cycles/device/device_opencl.cpp

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

diff --git a/intern/cycles/device/device.h b/intern/cycles/device/device.h
index 2702b79..89140ce 100644
--- a/intern/cycles/device/device.h
+++ b/intern/cycles/device/device.h
@@ -23,7 +23,6 @@
 #include "device_task.h"
 
 #include "util_list.h"
-#include "util_set.h"
 #include "util_stats.h"
 #include "util_string.h"
 #include "util_thread.h"
diff --git a/intern/cycles/device/device_opencl.cpp b/intern/cycles/device/device_opencl.cpp
index 8918537..25eb160 100644
--- a/intern/cycles/device/device_opencl.cpp
+++ b/intern/cycles/device/device_opencl.cpp
@@ -784,7 +784,7 @@ public:
 				string init_kernel_source = "#include \"kernel.cl\" // " + kernel_md5 + "\n";
 
 				/* if does not exist or loading binary failed, compile kernel */
-				if (!compile_kernel(kernel_path, init_kernel_source, "", &cpProgram, debug_src))
+				if(!compile_kernel(kernel_path, init_kernel_source, "", &cpProgram, debug_src))
 					return false;
 
 				/* save binary for reuse */
@@ -1298,22 +1298,22 @@ public:
 			}
 
 			/* If exists already, try use it. */
-			if (path_exists(clbin) && load_binary(kernel_path,
-			                                      clbin,
-			                                      custom_kernel_build_options,
-			                                      &path_trace_program,
-			                                      debug_src)) {
+			if(path_exists(clbin) && load_binary(kernel_path,
+			                                     clbin,
+			                                     custom_kernel_build_options,
+			                                     &path_trace_program,
+			                                     debug_src)) {
 				/* Kernel loaded from binary, nothing to do. */
 			}
 			else {
 				string init_kernel_source = "#include \"kernel.cl\" // " +
 				                            kernel_md5 + "\n";
 				/* If does not exist or loading binary failed, compile kernel. */
-				if (!compile_kernel(kernel_path,
-				                    init_kernel_source,
-				                    custom_kernel_build_options,
-				                    &path_trace_program,
-				                    debug_src))
+				if(!compile_kernel(kernel_path,
+				                   init_kernel_source,
+				                   custom_kernel_build_options,
+				                   &path_trace_program,
+				                   debug_src))
 				{
 					return false;
 				}
@@ -1842,19 +1842,19 @@ public:
 		string *debug_src = NULL;
 
 		/* If exists already, try use it. */
-		if (path_exists(clbin) && load_binary(kernel_path,
-		                                      clbin,
-		                                      custom_kernel_build_options,
-		                                      program,
-		                                      debug_src)) {
+		if(path_exists(clbin) && load_binary(kernel_path,
+		                                     clbin,
+		                                     custom_kernel_build_options,
+		                                     program,
+		                                     debug_src)) {
 			/* Kernel loaded from binary. */
 		}
 		else {
 			/* If does not exist or loading binary failed, compile kernel. */
-			if (!compile_kernel(kernel_path,
-			                    kernel_init_source,
-			                    custom_kernel_build_options,
-			                    program))
+			if(!compile_kernel(kernel_path,
+			                   kernel_init_source,
+			                   custom_kernel_build_options,
+			                   program))
 			{
 				return false;
 			}
@@ -3000,7 +3000,7 @@ public:
 			SPLIT_KERNEL_LOCAL_SIZE_X;
 		d_h = (((d_h - 1) / SPLIT_KERNEL_LOCAL_SIZE_Y) + 1) *
 			SPLIT_KERNEL_LOCAL_SIZE_Y;
-		while (d_w * d_h > num_global_threads) {
+		while(d_w * d_h > num_global_threads) {
 			/* Halve the longer dimension. */
 			if(d_w >= d_h) {
 				d_w = d_w / 2;
@@ -3079,7 +3079,7 @@ public:
 			size_t feasible_global_work_size;
 			const int2 tile_size = task->requested_tile_size;
 			/* Keep rendering tiles until done. */
-			while (task->acquire_tile(this, tile)) {
+			while(task->acquire_tile(this, tile)) {
 				if(!initialize_data_and_check_render_feasibility) {
 					/* Initialize data. */
 					/* Calculate per_thread_output_buffer_size. */