[Bf-blender-cvs] [3aa7482] master: Cycles: Cleanup, indentation and braces

Sergey Sharybin noreply at git.blender.org
Wed Feb 3 15:06:00 CET 2016


Commit: 3aa74828ab627723e6c98163bf6344ef1f009bcf
Author: Sergey Sharybin
Date:   Wed Feb 3 15:00:55 2016 +0100
Branches: master
https://developer.blender.org/rB3aa74828ab627723e6c98163bf6344ef1f009bcf

Cycles: Cleanup, indentation and braces

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

M	intern/cycles/blender/blender_object.cpp
M	intern/cycles/blender/blender_shader.cpp
M	intern/cycles/device/device_cuda.cpp
M	intern/cycles/device/device_opencl.cpp
M	intern/cycles/kernel/geom/geom_bvh.h
M	intern/cycles/kernel/kernel_light.h
M	intern/cycles/kernel/kernel_path_surface.h
M	intern/cycles/kernel/kernel_shader.h
M	intern/cycles/kernel/split/kernel_next_iteration_setup.h
M	intern/cycles/kernel/svm/svm_closure.h
M	intern/cycles/kernel/svm/svm_sky.h
M	intern/cycles/kernel/svm/svm_types.h
M	intern/cycles/render/graph.cpp
M	intern/cycles/render/image.cpp
M	intern/cycles/render/nodes.cpp
M	intern/cycles/render/sky_model.cpp
M	intern/cycles/subd/subd_mesh.cpp
M	intern/cycles/util/util_md5.cpp
M	intern/cycles/util/util_ssef.h

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

diff --git a/intern/cycles/blender/blender_object.cpp b/intern/cycles/blender/blender_object.cpp
index 1c5180a..5c0c30f 100644
--- a/intern/cycles/blender/blender_object.cpp
+++ b/intern/cycles/blender/blender_object.cpp
@@ -212,8 +212,8 @@ void BlenderSync::sync_background_light(bool use_portal)
 			ObjectKey key(b_world, 0, b_world);
 
 			if(light_map.sync(&light, b_world, b_world, key) ||
-				world_recalc ||
-				b_world.ptr.data != world_map)
+			    world_recalc ||
+			    b_world.ptr.data != world_map)
 			{
 				light->type = LIGHT_BACKGROUND;
 				light->map_resolution  = get_int(cworld, "sample_map_resolution");
diff --git a/intern/cycles/blender/blender_shader.cpp b/intern/cycles/blender/blender_shader.cpp
index ffe99bd..8870507 100644
--- a/intern/cycles/blender/blender_shader.cpp
+++ b/intern/cycles/blender/blender_shader.cpp
@@ -142,32 +142,32 @@ static void set_default_value(ShaderInput *input,
 {
 	/* copy values for non linked inputs */
 	switch(input->type) {
-	case SHADER_SOCKET_FLOAT: {
-		input->set(get_float(b_sock.ptr, "default_value"));
-		break;
-	}
-	case SHADER_SOCKET_INT: {
-		input->set((float)get_int(b_sock.ptr, "default_value"));
-		break;
-	}
-	case SHADER_SOCKET_COLOR: {
-		input->set(float4_to_float3(get_float4(b_sock.ptr, "default_value")));
-		break;
-	}
-	case SHADER_SOCKET_NORMAL:
-	case SHADER_SOCKET_POINT:
-	case SHADER_SOCKET_VECTOR: {
-		input->set(get_float3(b_sock.ptr, "default_value"));
-		break;
-	}
-	case SHADER_SOCKET_STRING: {
-		input->set((ustring)blender_absolute_path(b_data, b_id, get_string(b_sock.ptr, "default_value")));
-		break;
-	}
-	
-	case SHADER_SOCKET_CLOSURE:
-	case SHADER_SOCKET_UNDEFINED:
-		break;
+		case SHADER_SOCKET_FLOAT: {
+			input->set(get_float(b_sock.ptr, "default_value"));
+			break;
+		}
+		case SHADER_SOCKET_INT: {
+			input->set((float)get_int(b_sock.ptr, "default_value"));
+			break;
+		}
+		case SHADER_SOCKET_COLOR: {
+			input->set(float4_to_float3(get_float4(b_sock.ptr, "default_value")));
+			break;
+		}
+		case SHADER_SOCKET_NORMAL:
+		case SHADER_SOCKET_POINT:
+		case SHADER_SOCKET_VECTOR: {
+			input->set(get_float3(b_sock.ptr, "default_value"));
+			break;
+		}
+		case SHADER_SOCKET_STRING: {
+			input->set((ustring)blender_absolute_path(b_data, b_id, get_string(b_sock.ptr, "default_value")));
+			break;
+		}
+
+		case SHADER_SOCKET_CLOSURE:
+		case SHADER_SOCKET_UNDEFINED:
+			break;
 	}
 }
 
@@ -399,12 +399,12 @@ static ShaderNode *add_node(Scene *scene,
 		SubsurfaceScatteringNode *subsurface = new SubsurfaceScatteringNode();
 
 		switch(b_subsurface_node.falloff()) {
-		case BL::ShaderNodeSubsurfaceScattering::falloff_CUBIC:
-			subsurface->closure = CLOSURE_BSSRDF_CUBIC_ID;
-			break;
-		case BL::ShaderNodeSubsurfaceScattering::falloff_GAUSSIAN:
-			subsurface->closure = CLOSURE_BSSRDF_GAUSSIAN_ID;
-			break;
+			case BL::ShaderNodeSubsurfaceScattering::falloff_CUBIC:
+				subsurface->closure = CLOSURE_BSSRDF_CUBIC_ID;
+				break;
+			case BL::ShaderNodeSubsurfaceScattering::falloff_GAUSSIAN:
+				subsurface->closure = CLOSURE_BSSRDF_GAUSSIAN_ID;
+				break;
 		}
 
 		node = subsurface;
@@ -414,18 +414,18 @@ static ShaderNode *add_node(Scene *scene,
 		GlossyBsdfNode *glossy = new GlossyBsdfNode();
 		
 		switch(b_glossy_node.distribution()) {
-		case BL::ShaderNodeBsdfGlossy::distribution_SHARP:
-			glossy->distribution = ustring("Sharp");
-			break;
-		case BL::ShaderNodeBsdfGlossy::distribution_BECKMANN:
-			glossy->distribution = ustring("Beckmann");
-			break;
-		case BL::ShaderNodeBsdfGlossy::distribution_GGX:
-			glossy->distribution = ustring("GGX");
-			break;
-		case BL::ShaderNodeBsdfGlossy::distribution_ASHIKHMIN_SHIRLEY:
-			glossy->distribution = ustring("Ashikhmin-Shirley");
-			break;
+			case BL::ShaderNodeBsdfGlossy::distribution_SHARP:
+				glossy->distribution = ustring("Sharp");
+				break;
+			case BL::ShaderNodeBsdfGlossy::distribution_BECKMANN:
+				glossy->distribution = ustring("Beckmann");
+				break;
+			case BL::ShaderNodeBsdfGlossy::distribution_GGX:
+				glossy->distribution = ustring("GGX");
+				break;
+			case BL::ShaderNodeBsdfGlossy::distribution_ASHIKHMIN_SHIRLEY:
+				glossy->distribution = ustring("Ashikhmin-Shirley");
+				break;
 		}
 		node = glossy;
 	}
@@ -433,15 +433,15 @@ static ShaderNode *add_node(Scene *scene,
 		BL::ShaderNodeBsdfGlass b_glass_node(b_node);
 		GlassBsdfNode *glass = new GlassBsdfNode();
 		switch(b_glass_node.distribution()) {
-		case BL::ShaderNodeBsdfGlass::distribution_SHARP:
-			glass->distribution = ustring("Sharp");
-			break;
-		case BL::ShaderNodeBsdfGlass::distribution_BECKMANN:
-			glass->distribution = ustring("Beckmann");
-			break;
-		case BL::ShaderNodeBsdfGlass::distribution_GGX:
-			glass->distribution = ustring("GGX");
-			break;
+			case BL::ShaderNodeBsdfGlass::distribution_SHARP:
+				glass->distribution = ustring("Sharp");
+				break;
+			case BL::ShaderNodeBsdfGlass::distribution_BECKMANN:
+				glass->distribution = ustring("Beckmann");
+				break;
+			case BL::ShaderNodeBsdfGlass::distribution_GGX:
+				glass->distribution = ustring("GGX");
+				break;
 		}
 		node = glass;
 	}
diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp
index 39af40d..8bef6c9 100644
--- a/intern/cycles/device/device_cuda.cpp
+++ b/intern/cycles/device/device_cuda.cpp
@@ -657,14 +657,14 @@ public:
 
 		/* pass in parameters */
 		void *args[] = {&d_buffer,
-						 &d_rng_state,
-						 &sample,
-						 &rtile.x,
-						 &rtile.y,
-						 &rtile.w,
-						 &rtile.h,
-						 &rtile.offset,
-						 &rtile.stride};
+		                &d_rng_state,
+		                &sample,
+		                &rtile.x,
+		                &rtile.y,
+		                &rtile.w,
+		                &rtile.h,
+		                &rtile.offset,
+		                &rtile.stride};
 
 		/* launch kernel */
 		int threads_per_block;
@@ -684,9 +684,9 @@ public:
 		cuda_assert(cuFuncSetCacheConfig(cuPathTrace, CU_FUNC_CACHE_PREFER_L1));
 
 		cuda_assert(cuLaunchKernel(cuPathTrace,
-								   xblocks , yblocks, 1, /* blocks */
-								   xthreads, ythreads, 1, /* threads */
-								   0, 0, args, 0));
+		                           xblocks , yblocks, 1, /* blocks */
+		                           xthreads, ythreads, 1, /* threads */
+		                           0, 0, args, 0));
 
 		cuda_assert(cuCtxSynchronize());
 
@@ -717,14 +717,14 @@ public:
 
 		/* pass in parameters */
 		void *args[] = {&d_rgba,
-						 &d_buffer,
-						 &sample_scale,
-						 &task.x,
-						 &task.y,
-						 &task.w,
-						 &task.h,
-						 &task.offset,
-						 &task.stride};
+		                &d_buffer,
+		                &sample_scale,
+		                &task.x,
+		                &task.y,
+		                &task.w,
+		                &task.h,
+		                &task.offset,
+		                &task.stride};
 
 		/* launch kernel */
 		int threads_per_block;
@@ -738,9 +738,9 @@ public:
 		cuda_assert(cuFuncSetCacheConfig(cuFilmConvert, CU_FUNC_CACHE_PREFER_L1));
 
 		cuda_assert(cuLaunchKernel(cuFilmConvert,
-								   xblocks , yblocks, 1, /* blocks */
-								   xthreads, ythreads, 1, /* threads */
-								   0, 0, args, 0));
+		                           xblocks , yblocks, 1, /* blocks */
+		                           xthreads, ythreads, 1, /* threads */
+		                           0, 0, args, 0));
 
 		unmap_pixels((rgba_byte)? rgba_byte: rgba_half);
 
@@ -803,9 +803,9 @@ public:
 
 				cuda_assert(cuFuncSetCacheConfig(cuShader, CU_FUNC_CACHE_PREFER_L1));
 				cuda_assert(cuLaunchKernel(cuShader,
-										   xblocks , 1, 1, /* blocks */
-										   threads_per_block, 1, 1, /* threads */
-										   0, 0, args, 0));
+				                           xblocks , 1, 1, /* blocks */
+				                           threads_per_block, 1, 1, /* threads */
+				                           0, 0, args, 0));
 
 				cuda_assert(cuCtxSynchronize());
 
diff --git a/intern/cycles/device/device_opencl.cpp b/intern/cycles/device/device_opencl.cpp
index c41da54..1b4e542 100644
--- a/intern/cycles/device/device_opencl.cpp
+++ b/intern/cycles/device/device_opencl.cpp
@@ -994,7 +994,8 @@ public:
 			if(path_exists(clbin) && load_binary(kernel_path,
 			                                     clbin,
 			                                     build_flags,
-			                                     &cpProgram)) {
+			                                     &cpProgram))
+			{
 				/* Kernel loaded from binary, nothing to do. */
 				VLOG(2) << "Loaded kernel from " << clbin << ".";
 			}
@@ -1672,7 +1673,8 @@ public:
 			                                     clbin,
 			                                     custom_kernel_build_options,
 			                                     &path_trace_program,
-			                                     debug_src)) {
+			                                     debug_src))
+			{
 				/* Kernel loaded from binary, nothing to do. */
 			}
 			else {
@@ -2080,7 +2082,8 @@ public:
 		                                     clbin,
 		                                     custom_kernel_build_options,
 		                                     program,
-		                                     debug_src)) {
+		                                     debug_src))
+		{
 			/* Kernel loaded from binary. */
 		}
 		else {
diff --git a/intern/cycles/kernel/geom/geom_bvh.h b/intern/cycles/kernel/geom/geom_bvh.h
index cea5050..d9f4076 100644
--- a/intern/cycles/kernel/geom/geom_bvh.h
+++ b/intern/cycles/kernel/geom/geom_bvh.h
@@ -216,8 +216,13 @@ CCL_NAMESPACE_BEGIN
 #undef BVH_NAME_EVAL
 #undef BVH_FUNCTION_FULL_NAME
 
-ccl_device_intersect bool scene_intersect(KernelGlobals *kg, const Ray *ray, const uint visibility, Intersection *isect,
-					 uint *lcg_state, float difl, float extmax)
+ccl_device_intersect bool scene_intersect(KernelGlobals *kg,
+                                          const Ray *ray,
+                                          const uint visibility,
+                                          Intersection *isect,
+                                          uint *lcg_state,
+                                          float difl,
+                                          float extmax)
 {
 #ifdef __OBJECT_

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list