[Bf-blender-cvs] [bbc652a] cycles_kernel_split: [BCYCLES-209] Refactor : rename variables sd_shadow -> sd_DL_shadow

varunsundar08 noreply at git.blender.org
Wed Apr 15 17:37:12 CEST 2015


Commit: bbc652a3b90f07d6da1810f9b7f9bbd674e00ec2
Author: varunsundar08
Date:   Sun Apr 12 03:13:00 2015 +0530
Branches: cycles_kernel_split
https://developer.blender.org/rBbbc652a3b90f07d6da1810f9b7f9bbd674e00ec2

[BCYCLES-209] Refactor : rename variables sd_shadow -> sd_DL_shadow

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

M	intern/cycles/device/device_opencl.cpp
M	intern/cycles/kernel/kernel_DataInit.cl

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

diff --git a/intern/cycles/device/device_opencl.cpp b/intern/cycles/device/device_opencl.cpp
index 29cd5ac..3fe608b 100644
--- a/intern/cycles/device/device_opencl.cpp
+++ b/intern/cycles/device/device_opencl.cpp
@@ -402,9 +402,6 @@ public:
 	cl_mem Ray_coop;
 	cl_mem PathState_coop;
 	cl_mem Intersection_coop;
-	cl_mem ShaderData_coop;
-	cl_mem ShaderData_coop_DL;
-	cl_mem ShaderData_coop_shadow;
 
 	/* KernelGlobals buffer */
 	cl_mem kgbuffer;
@@ -415,55 +412,55 @@ public:
 
 	/* global buffers of each member of ShaderData */
 	cl_mem P_sd;
-	cl_mem P_sd_shadow;
+	cl_mem P_sd_DL_shadow;
 	cl_mem N_sd;
-	cl_mem N_sd_shadow;
+	cl_mem N_sd_DL_shadow;
 	cl_mem Ng_sd;
-	cl_mem Ng_sd_shadow;
+	cl_mem Ng_sd_DL_shadow;
 	cl_mem I_sd;
-	cl_mem I_sd_shadow;
+	cl_mem I_sd_DL_shadow;
 	cl_mem shader_sd;
-	cl_mem shader_sd_shadow;
+	cl_mem shader_sd_DL_shadow;
 	cl_mem flag_sd;
-	cl_mem flag_sd_shadow;
+	cl_mem flag_sd_DL_shadow;
 	cl_mem prim_sd;
-	cl_mem prim_sd_shadow;
+	cl_mem prim_sd_DL_shadow;
 	cl_mem type_sd;
-	cl_mem type_sd_shadow;
+	cl_mem type_sd_DL_shadow;
 	cl_mem u_sd;
-	cl_mem u_sd_shadow;
+	cl_mem u_sd_DL_shadow;
 	cl_mem v_sd;
-	cl_mem v_sd_shadow;
+	cl_mem v_sd_DL_shadow;
 	cl_mem object_sd;
-	cl_mem object_sd_shadow;
+	cl_mem object_sd_DL_shadow;
 	cl_mem time_sd;
-	cl_mem time_sd_shadow;
+	cl_mem time_sd_DL_shadow;
 	cl_mem ray_length_sd;
-	cl_mem ray_length_sd_shadow;
+	cl_mem ray_length_sd_DL_shadow;
 	cl_mem ray_depth_sd;
-	cl_mem ray_depth_sd_shadow;
+	cl_mem ray_depth_sd_DL_shadow;
 	cl_mem transparent_depth_sd;
-	cl_mem transparent_depth_sd_shadow;
+	cl_mem transparent_depth_sd_DL_shadow;
 #ifdef __RAY_DIFFERENTIALS__
 	cl_mem dP_sd,dI_sd;
-	cl_mem dP_sd_shadow, dI_sd_shadow;
+	cl_mem dP_sd_DL_shadow, dI_sd_DL_shadow;
 	cl_mem du_sd, dv_sd;
-	cl_mem du_sd_shadow, dv_sd_shadow;
+	cl_mem du_sd_DL_shadow, dv_sd_DL_shadow;
 #endif
 #ifdef __DPDU__
 	cl_mem dPdu_sd, dPdv_sd;
-	cl_mem dPdu_sd_shadow, dPdv_sd_shadow;
+	cl_mem dPdu_sd_DL_shadow, dPdv_sd_DL_shadow;
 #endif
 	cl_mem closure_sd;
-	cl_mem closure_sd_shadow;
+	cl_mem closure_sd_DL_shadow;
 	cl_mem num_closure_sd;
-	cl_mem num_closure_sd_shadow;
+	cl_mem num_closure_sd_DL_shadow;
 	cl_mem randb_closure_sd;
-	cl_mem randb_closure_sd_shadow;
+	cl_mem randb_closure_sd_DL_shadow;
 	cl_mem ray_P_sd;
-	cl_mem ray_P_sd_shadow;
+	cl_mem ray_P_sd_DL_shadow;
 	cl_mem ray_dP_sd;
-	cl_mem ray_dP_sd_shadow;
+	cl_mem ray_dP_sd_DL_shadow;
 
 	/* Global memory required for shadow blocked and accum_radiance */
 	cl_mem BSDFEval_coop;
@@ -653,61 +650,61 @@ public:
 		sd_DL_shadow = NULL;
 
 		P_sd = NULL;
-		P_sd_shadow = NULL;
+		P_sd_DL_shadow = NULL;
 		N_sd = NULL;
-		N_sd_shadow = NULL;
+		N_sd_DL_shadow = NULL;
 		Ng_sd = NULL;
-		Ng_sd_shadow = NULL;
+		Ng_sd_DL_shadow = NULL;
 		I_sd = NULL;
-		I_sd_shadow = NULL;
+		I_sd_DL_shadow = NULL;
 		shader_sd = NULL;
-		shader_sd_shadow = NULL;
+		shader_sd_DL_shadow = NULL;
 		flag_sd = NULL;
-		flag_sd_shadow = NULL;
+		flag_sd_DL_shadow = NULL;
 		prim_sd = NULL;
-		prim_sd_shadow = NULL;
+		prim_sd_DL_shadow = NULL;
 		type_sd = NULL;
-		type_sd_shadow = NULL;
+		type_sd_DL_shadow = NULL;
 		u_sd = NULL;
-		u_sd_shadow = NULL;
+		u_sd_DL_shadow = NULL;
 		v_sd = NULL;
-		v_sd_shadow = NULL;
+		v_sd_DL_shadow = NULL;
 		object_sd = NULL;
-		object_sd_shadow = NULL;
+		object_sd_DL_shadow = NULL;
 		time_sd = NULL;
-		time_sd_shadow = NULL;
+		time_sd_DL_shadow = NULL;
 		ray_length_sd = NULL;
-		ray_length_sd_shadow = NULL;
+		ray_length_sd_DL_shadow = NULL;
 		ray_depth_sd = NULL;
-		ray_depth_sd_shadow = NULL;
+		ray_depth_sd_DL_shadow = NULL;
 		transparent_depth_sd = NULL;
-		transparent_depth_sd_shadow = NULL;
+		transparent_depth_sd_DL_shadow = NULL;
 #ifdef __RAY_DIFFERENTIALS__
 		dP_sd = NULL;
 		dI_sd = NULL;
-		dP_sd_shadow = NULL;
-		dI_sd_shadow = NULL;
+		dP_sd_DL_shadow = NULL;
+		dI_sd_DL_shadow = NULL;
 		du_sd = NULL;
 		dv_sd = NULL;
-		du_sd_shadow = NULL;
-		dv_sd_shadow = NULL;
+		du_sd_DL_shadow = NULL;
+		dv_sd_DL_shadow = NULL;
 #endif
 #ifdef __DPDU__
 		dPdu_sd = NULL;
 		dPdv_sd = NULL;
-		dPdu_sd_shadow = NULL;
-		dPdv_sd_shadow = NULL;
+		dPdu_sd_DL_shadow = NULL;
+		dPdv_sd_DL_shadow = NULL;
 #endif
 		closure_sd = NULL;
-		closure_sd_shadow = NULL;
+		closure_sd_DL_shadow = NULL;
 		num_closure_sd = NULL;
-		num_closure_sd_shadow = NULL;
+		num_closure_sd_DL_shadow = NULL;
 		randb_closure_sd = NULL;
-		randb_closure_sd_shadow = NULL;
+		randb_closure_sd_DL_shadow = NULL;
 		ray_P_sd = NULL;
-		ray_P_sd_shadow = NULL;
+		ray_P_sd_DL_shadow = NULL;
 		ray_dP_sd = NULL;
-		ray_dP_sd_shadow = NULL;
+		ray_dP_sd_DL_shadow = NULL;
 
 		rng_coop = NULL;
 		throughput_coop = NULL;
@@ -716,9 +713,6 @@ public:
 		Ray_coop = NULL;
 		PathState_coop = NULL;
 		Intersection_coop = NULL;
-		ShaderData_coop = NULL;
-		ShaderData_coop_DL = NULL;
-		ShaderData_coop_shadow = NULL;
 		ray_state = NULL;
 
 		AOAlpha_coop = NULL;
@@ -1843,161 +1837,161 @@ public:
 		if(P_sd != NULL)
 			clReleaseMemObject(P_sd);
 
-		if(P_sd_shadow != NULL)
-			clReleaseMemObject(P_sd_shadow);
+		if(P_sd_DL_shadow != NULL)
+			clReleaseMemObject(P_sd_DL_shadow);
 
 		if(N_sd != NULL)
 			clReleaseMemObject(N_sd);
 
-		if(N_sd_shadow != NULL)
-			clReleaseMemObject(N_sd_shadow);
+		if(N_sd_DL_shadow != NULL)
+			clReleaseMemObject(N_sd_DL_shadow);
 
 		if(Ng_sd != NULL)
 			clReleaseMemObject(Ng_sd);
 
-		if(Ng_sd_shadow != NULL)
-			clReleaseMemObject(Ng_sd_shadow);
+		if(Ng_sd_DL_shadow != NULL)
+			clReleaseMemObject(Ng_sd_DL_shadow);
 
 		if(I_sd != NULL)
 			clReleaseMemObject(I_sd);
 
-		if(I_sd_shadow != NULL)
-			clReleaseMemObject(I_sd_shadow);
+		if(I_sd_DL_shadow != NULL)
+			clReleaseMemObject(I_sd_DL_shadow);
 
 		if(shader_sd != NULL)
 			clReleaseMemObject(shader_sd);
 
-		if(shader_sd_shadow != NULL)
-			clReleaseMemObject(shader_sd_shadow);
+		if(shader_sd_DL_shadow != NULL)
+			clReleaseMemObject(shader_sd_DL_shadow);
 
 		if(flag_sd != NULL)
 			clReleaseMemObject(flag_sd);
 
-		if(flag_sd_shadow != NULL)
-			clReleaseMemObject(flag_sd_shadow);
+		if(flag_sd_DL_shadow != NULL)
+			clReleaseMemObject(flag_sd_DL_shadow);
 
 		if(prim_sd != NULL)
 			clReleaseMemObject(prim_sd);
 
-		if(prim_sd_shadow != NULL)
-			clReleaseMemObject(prim_sd_shadow);
+		if(prim_sd_DL_shadow != NULL)
+			clReleaseMemObject(prim_sd_DL_shadow);
 
 		if(type_sd != NULL)
 			clReleaseMemObject(type_sd);
 
-		if(type_sd_shadow != NULL)
-			clReleaseMemObject(type_sd_shadow);
+		if(type_sd_DL_shadow != NULL)
+			clReleaseMemObject(type_sd_DL_shadow);
 
 		if(u_sd != NULL)
 			clReleaseMemObject(u_sd);
 
-		if(u_sd_shadow != NULL)
-			clReleaseMemObject(u_sd_shadow);
+		if(u_sd_DL_shadow != NULL)
+			clReleaseMemObject(u_sd_DL_shadow);
 
 		if(v_sd != NULL)
 			clReleaseMemObject(v_sd);
 
-		if(v_sd_shadow != NULL)
-			clReleaseMemObject(v_sd_shadow);
+		if(v_sd_DL_shadow != NULL)
+			clReleaseMemObject(v_sd_DL_shadow);
 
 		if(object_sd != NULL)
 			clReleaseMemObject(object_sd);
 
-		if(object_sd_shadow != NULL)
-			clReleaseMemObject(object_sd_shadow);
+		if(object_sd_DL_shadow != NULL)
+			clReleaseMemObject(object_sd_DL_shadow);
 
 		if(time_sd != NULL)
 			clReleaseMemObject(time_sd);
 
-		if(time_sd_shadow != NULL)
-			clReleaseMemObject(time_sd_shadow);
+		if(time_sd_DL_shadow != NULL)
+			clReleaseMemObject(time_sd_DL_shadow);
 
 		if(ray_length_sd != NULL)
 			clReleaseMemObject(ray_length_sd);
 
-		if(ray_length_sd_shadow != NULL)
-			clReleaseMemObject(ray_length_sd_shadow);
+		if(ray_length_sd_DL_shadow != NULL)
+			clReleaseMemObject(ray_length_sd_DL_shadow);
 
 		if(ray_depth_sd != NULL)
 			clReleaseMemObject(ray_depth_sd);
 
-		if(ray_depth_sd_shadow != NULL)
-			clReleaseMemObject(ray_depth_sd_shadow);
+		if(ray_depth_sd_DL_shadow != NULL)
+			clReleaseMemObject(ray_depth_sd_DL_shadow);
 
 		if(transparent_depth_sd != NULL)
 			clReleaseMemObject(transparent_depth_sd);
 
-		if(transparent_depth_sd_shadow != NULL)
-			clReleaseMemObject(transparent_depth_sd_shadow);
+		if(transparent_depth_sd_DL_shadow != NULL)
+			clReleaseMemObject(transparent_depth_sd_DL_shadow);
 
 #ifdef __RAY_DIFFERENTIALS__
 		if(dP_sd != NULL)
 			clReleaseMemObject(dP_sd);
 
-		if(dP_sd_shadow != NULL)
-			clReleaseMemObject(dP_sd_shadow);
+		if(dP_sd_DL_shadow != NULL)
+			clReleaseMemObject(dP_sd_DL_shadow);
 
 		if(dI_sd != NULL)
 			clReleaseMemObject(dI_sd);
 
-		if(dI_sd_shadow != NULL)
-			clReleaseMemObject(dI_sd_shadow);
+		if(dI_sd_DL_shadow != NULL)
+			clReleaseMemObject(dI_sd_DL_shadow);
 
 		if(du_sd != NULL)
 			clReleaseMemObject(du_sd);
 
-		if(du_sd_shadow != NULL)
-			clReleaseMemObject(du_sd_shadow);
+		if(du_sd_DL_shadow != NULL)
+			clReleaseMemObject(du_sd_DL_shadow);
 
 		if(dv_sd != NULL)
 			clReleaseMemObject(dv_sd);
 
-		if(dv_sd_shadow != NULL)
-			clReleaseMemObject(dv_sd_shadow);
+		if(dv_sd_DL_shadow != NULL)
+			clReleaseMemObject(dv_sd_DL_shadow);
 #endif
 #ifdef __DPDU__
 		if(dPdu_sd != NULL)
 			clReleaseMemObject(dPdu_sd);
 
-		if(dPdu_sd_shadow != NULL)
-			clReleaseMemObject(dPdu_sd_shadow);
+		if(dPdu_sd_DL_shadow != NULL)
+			clReleaseMemObject(dPdu_sd_DL_shadow);
 
 		if(dPdv_sd != NULL)
 			clReleaseMemObject(dPdv_sd);
 
-		if(dPdv_sd_shadow != NULL)
-			clReleaseMemObject(dPdv_sd_shadow);
+		if(dPdv_sd_DL_shadow != NULL)
+			clReleaseMemObject(dPdv_sd_DL_shadow);
 #endif
 
 		if(closure_sd != NULL)
 			clReleaseMemObject(closure_sd);
 
-		if(closure_sd_shadow != NULL)
-			clReleaseMemObject(closure_sd_shadow);
+		if(closure_sd_DL_shadow != NULL)
+			clReleaseMemObject(closure_sd_DL_shadow);
 
 		if(num_closure_sd != NULL)
 			clReleaseMemObject(num_closure_sd);
 
-		if(num_closure_sd_shadow != NULL)
-			clReleaseMemObject(num_closure_sd_shadow);
+		if(num_closure_sd_DL_shadow != NULL)
+			clReleaseMemObject(num_closure_sd_DL_shadow);
 
 		if(randb_closure_sd != NULL)
 			clReleaseMemObject(randb_closure_sd);
 
-		if(randb_closure_sd_shadow != NULL)
-			clReleaseMemObject(randb_closure_sd_shadow);
+		if(randb_closure_sd_DL_shadow != NULL)
+			clReleaseMemObject(randb_closure_sd_DL_shadow);
 
 		if(ray_P_sd != NULL)
 			clReleaseMemObject(ray_P_sd);
 
-		if(ray_P_sd_shadow != NULL)
-			clReleaseMemObject(ray_P_sd_shadow

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list