[Bf-blender-cvs] [43821cd] cycles_kernel_split: [BCYCLES-209] make direct lighting and shadow kernels share members of shaderData buffers

Kavitha Sampath noreply at git.blender.org
Wed Apr 15 17:37:11 CEST 2015


Commit: 43821cd8cdbe57e094210c1411d0c9295f8abc48
Author: Kavitha Sampath
Date:   Fri Apr 10 19:45:44 2015 +0530
Branches: cycles_kernel_split
https://developer.blender.org/rB43821cd8cdbe57e094210c1411d0c9295f8abc48

[BCYCLES-209] make direct lighting and shadow kernels share members of
shaderData buffers

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

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 b6fd5a0..29cd5ac 100644
--- a/intern/cycles/device/device_opencl.cpp
+++ b/intern/cycles/device/device_opencl.cpp
@@ -415,77 +415,54 @@ public:
 
 	/* global buffers of each member of ShaderData */
 	cl_mem P_sd;
-	cl_mem P_sd_dl;
 	cl_mem P_sd_shadow;
 	cl_mem N_sd;
-	cl_mem N_sd_dl;
 	cl_mem N_sd_shadow;
 	cl_mem Ng_sd;
-	cl_mem Ng_sd_dl;
 	cl_mem Ng_sd_shadow;
 	cl_mem I_sd;
-	cl_mem I_sd_dl;
 	cl_mem I_sd_shadow;
 	cl_mem shader_sd;
-	cl_mem shader_sd_dl;
 	cl_mem shader_sd_shadow;
 	cl_mem flag_sd;
-	cl_mem flag_sd_dl;
 	cl_mem flag_sd_shadow;
 	cl_mem prim_sd;
-	cl_mem prim_sd_dl;
 	cl_mem prim_sd_shadow;
 	cl_mem type_sd;
-	cl_mem type_sd_dl;
 	cl_mem type_sd_shadow;
 	cl_mem u_sd;
-	cl_mem u_sd_dl;
 	cl_mem u_sd_shadow;
 	cl_mem v_sd;
-	cl_mem v_sd_dl;
 	cl_mem v_sd_shadow;
 	cl_mem object_sd;
-	cl_mem object_sd_dl;
 	cl_mem object_sd_shadow;
 	cl_mem time_sd;
-	cl_mem time_sd_dl;
 	cl_mem time_sd_shadow;
 	cl_mem ray_length_sd;
-	cl_mem ray_length_sd_dl;
 	cl_mem ray_length_sd_shadow;
 	cl_mem ray_depth_sd;
-	cl_mem ray_depth_sd_dl;
 	cl_mem ray_depth_sd_shadow;
 	cl_mem transparent_depth_sd;
-	cl_mem transparent_depth_sd_dl;
 	cl_mem transparent_depth_sd_shadow;
 #ifdef __RAY_DIFFERENTIALS__
 	cl_mem dP_sd,dI_sd;
-	cl_mem dP_sd_dl, dI_sd_dl;
 	cl_mem dP_sd_shadow, dI_sd_shadow;
 	cl_mem du_sd, dv_sd;
-	cl_mem du_sd_dl, dv_sd_dl;
 	cl_mem du_sd_shadow, dv_sd_shadow;
 #endif
 #ifdef __DPDU__
 	cl_mem dPdu_sd, dPdv_sd;
-	cl_mem dPdu_sd_dl, dPdv_sd_dl;
 	cl_mem dPdu_sd_shadow, dPdv_sd_shadow;
 #endif
 	cl_mem closure_sd;
-	cl_mem closure_sd_dl;
 	cl_mem closure_sd_shadow;
 	cl_mem num_closure_sd;
-	cl_mem num_closure_sd_dl;
 	cl_mem num_closure_sd_shadow;
 	cl_mem randb_closure_sd;
-	cl_mem randb_closure_sd_dl;
 	cl_mem randb_closure_sd_shadow;
 	cl_mem ray_P_sd;
-	cl_mem ray_P_sd_dl;
 	cl_mem ray_P_sd_shadow;
 	cl_mem ray_dP_sd;
-	cl_mem ray_dP_sd_dl;
 	cl_mem ray_dP_sd_shadow;
 
 	/* Global memory required for shadow blocked and accum_radiance */
@@ -676,86 +653,60 @@ public:
 		sd_DL_shadow = NULL;
 
 		P_sd = NULL;
-		P_sd_dl = NULL;;
 		P_sd_shadow = NULL;
 		N_sd = NULL;
-		N_sd_dl = NULL;
 		N_sd_shadow = NULL;
 		Ng_sd = NULL;
-		Ng_sd_dl = NULL;
 		Ng_sd_shadow = NULL;
 		I_sd = NULL;
-		I_sd_dl = NULL;
 		I_sd_shadow = NULL;
 		shader_sd = NULL;
-		shader_sd_dl = NULL;
 		shader_sd_shadow = NULL;
 		flag_sd = NULL;
-		flag_sd_dl = NULL;
 		flag_sd_shadow = NULL;
 		prim_sd = NULL;
-		prim_sd_dl = NULL;
 		prim_sd_shadow = NULL;
 		type_sd = NULL;
-		type_sd_dl = NULL;
 		type_sd_shadow = NULL;
 		u_sd = NULL;
-		u_sd_dl = NULL;
 		u_sd_shadow = NULL;
 		v_sd = NULL;
-		v_sd_dl = NULL;
 		v_sd_shadow = NULL;
 		object_sd = NULL;
-		object_sd_dl = NULL;
 		object_sd_shadow = NULL;
 		time_sd = NULL;
-		time_sd_dl = NULL;
 		time_sd_shadow = NULL;
 		ray_length_sd = NULL;
-		ray_length_sd_dl = NULL;
 		ray_length_sd_shadow = NULL;
 		ray_depth_sd = NULL;
-		ray_depth_sd_dl = NULL;
 		ray_depth_sd_shadow = NULL;
 		transparent_depth_sd = NULL;
-		transparent_depth_sd_dl = NULL;
 		transparent_depth_sd_shadow = NULL;
 #ifdef __RAY_DIFFERENTIALS__
 		dP_sd = NULL;
 		dI_sd = NULL;
-		dP_sd_dl = NULL;
-		dI_sd_dl = NULL;
 		dP_sd_shadow = NULL;
 		dI_sd_shadow = NULL;
 		du_sd = NULL;
 		dv_sd = NULL;
-		du_sd_dl = NULL;
-		dv_sd_dl = NULL;
 		du_sd_shadow = NULL;
 		dv_sd_shadow = NULL;
 #endif
 #ifdef __DPDU__
 		dPdu_sd = NULL;
 		dPdv_sd = NULL;
-		dPdu_sd_dl = NULL;
-		dPdv_sd_dl = NULL;
 		dPdu_sd_shadow = NULL;
 		dPdv_sd_shadow = NULL;
 #endif
 		closure_sd = NULL;
-		closure_sd_dl = NULL;
 		closure_sd_shadow = NULL;
 		num_closure_sd = NULL;
-		num_closure_sd_dl = NULL;
 		num_closure_sd_shadow = NULL;
 		randb_closure_sd = NULL;
-		randb_closure_sd_dl = NULL;
 		randb_closure_sd_shadow = NULL;
 		ray_P_sd = NULL;
-		ray_P_sd_dl = NULL;
 		ray_P_sd_shadow = NULL;
 		ray_dP_sd = NULL;
-		ray_dP_sd_dl = NULL;
 		ray_dP_sd_shadow = NULL;
 
 		rng_coop = NULL;
@@ -1892,135 +1843,90 @@ public:
 		if(P_sd != NULL)
 			clReleaseMemObject(P_sd);
 
-		if(P_sd_dl != NULL)
-			clReleaseMemObject(P_sd_dl);
-
 		if(P_sd_shadow != NULL)
 			clReleaseMemObject(P_sd_shadow);
 
 		if(N_sd != NULL)
 			clReleaseMemObject(N_sd);
 
-		if(N_sd_dl != NULL)
-			clReleaseMemObject(N_sd_dl);
-
 		if(N_sd_shadow != NULL)
 			clReleaseMemObject(N_sd_shadow);
 
 		if(Ng_sd != NULL)
 			clReleaseMemObject(Ng_sd);
 
-		if(Ng_sd_dl != NULL)
-			clReleaseMemObject(Ng_sd_dl);
-
 		if(Ng_sd_shadow != NULL)
 			clReleaseMemObject(Ng_sd_shadow);
 
 		if(I_sd != NULL)
 			clReleaseMemObject(I_sd);
 
-		if(I_sd_dl != NULL)
-			clReleaseMemObject(I_sd_dl);
-
 		if(I_sd_shadow != NULL)
 			clReleaseMemObject(I_sd_shadow);
 
 		if(shader_sd != NULL)
 			clReleaseMemObject(shader_sd);
 
-		if(shader_sd_dl != NULL)
-			clReleaseMemObject(shader_sd_dl);
-
 		if(shader_sd_shadow != NULL)
 			clReleaseMemObject(shader_sd_shadow);
 
 		if(flag_sd != NULL)
 			clReleaseMemObject(flag_sd);
 
-		if(flag_sd_dl != NULL)
-			clReleaseMemObject(flag_sd_dl);
-
 		if(flag_sd_shadow != NULL)
 			clReleaseMemObject(flag_sd_shadow);
 
 		if(prim_sd != NULL)
 			clReleaseMemObject(prim_sd);
 
-		if(prim_sd_dl != NULL)
-			clReleaseMemObject(prim_sd_dl);
-
 		if(prim_sd_shadow != NULL)
 			clReleaseMemObject(prim_sd_shadow);
 
 		if(type_sd != NULL)
 			clReleaseMemObject(type_sd);
 
-		if(type_sd_dl != NULL)
-			clReleaseMemObject(type_sd_dl);
-
 		if(type_sd_shadow != NULL)
 			clReleaseMemObject(type_sd_shadow);
 
 		if(u_sd != NULL)
 			clReleaseMemObject(u_sd);
 
-		if(u_sd_dl != NULL)
-			clReleaseMemObject(u_sd_dl);
-
 		if(u_sd_shadow != NULL)
 			clReleaseMemObject(u_sd_shadow);
 
 		if(v_sd != NULL)
 			clReleaseMemObject(v_sd);
 
-		if(v_sd_dl != NULL)
-			clReleaseMemObject(v_sd_dl);
-
 		if(v_sd_shadow != NULL)
 			clReleaseMemObject(v_sd_shadow);
 
 		if(object_sd != NULL)
 			clReleaseMemObject(object_sd);
 
-		if(object_sd_dl != NULL)
-			clReleaseMemObject(object_sd_dl);
-
 		if(object_sd_shadow != NULL)
 			clReleaseMemObject(object_sd_shadow);
 
 		if(time_sd != NULL)
 			clReleaseMemObject(time_sd);
 
-		if(time_sd_dl != NULL)
-			clReleaseMemObject(time_sd_dl);
-
 		if(time_sd_shadow != NULL)
 			clReleaseMemObject(time_sd_shadow);
 
 		if(ray_length_sd != NULL)
 			clReleaseMemObject(ray_length_sd);
 
-		if(ray_length_sd_dl != NULL)
-			clReleaseMemObject(ray_length_sd_dl);
-
 		if(ray_length_sd_shadow != NULL)
 			clReleaseMemObject(ray_length_sd_shadow);
 
 		if(ray_depth_sd != NULL)
 			clReleaseMemObject(ray_depth_sd);
 
-		if(ray_depth_sd_dl != NULL)
-			clReleaseMemObject(ray_depth_sd_dl);
-
 		if(ray_depth_sd_shadow != NULL)
 			clReleaseMemObject(ray_depth_sd_shadow);
 
 		if(transparent_depth_sd != NULL)
 			clReleaseMemObject(transparent_depth_sd);
 
-		if(transparent_depth_sd_dl != NULL)
-			clReleaseMemObject(transparent_depth_sd_dl);
-
 		if(transparent_depth_sd_shadow != NULL)
 			clReleaseMemObject(transparent_depth_sd_shadow);
 
@@ -2028,36 +1934,24 @@ public:
 		if(dP_sd != NULL)
 			clReleaseMemObject(dP_sd);
 
-		if(dP_sd_dl != NULL)
-			clReleaseMemObject(dP_sd_dl);
-
 		if(dP_sd_shadow != NULL)
 			clReleaseMemObject(dP_sd_shadow);
 
 		if(dI_sd != NULL)
 			clReleaseMemObject(dI_sd);
 
-		if(dI_sd_dl != NULL)
-			clReleaseMemObject(dI_sd_dl);
-
 		if(dI_sd_shadow != NULL)
 			clReleaseMemObject(dI_sd_shadow);
 
 		if(du_sd != NULL)
 			clReleaseMemObject(du_sd);
 
-		if(du_sd_dl != NULL)
-			clReleaseMemObject(du_sd_dl);
-
 		if(du_sd_shadow != NULL)
 			clReleaseMemObject(du_sd_shadow);
 
 		if(dv_sd != NULL)
 			clReleaseMemObject(dv_sd);
 
-		if(dv_sd_dl != NULL)
-			clReleaseMemObject(dv_sd_dl);
-
 		if(dv_sd_shadow != NULL)
 			clReleaseMemObject(dv_sd_shadow);
 #endif
@@ -2065,18 +1959,12 @@ public:
 		if(dPdu_sd != NULL)
 			clReleaseMemObject(dPdu_sd);
 
-		if(dPdu_sd_dl != NULL)
-			clReleaseMemObject(dPdu_sd_dl);
-
 		if(dPdu_sd_shadow != NULL)
 			clReleaseMemObject(dPdu_sd_shadow);
 
 		if(dPdv_sd != NULL)
 			clReleaseMemObject(dPdv_sd);
 
-		if(dPdv_sd_dl != NULL)
-			clReleaseMemObject(dPdv_sd_dl);
-
 		if(dPdv_sd_shadow != NULL)
 			clReleaseMemObject(dPdv_sd_shadow);
 #endif
@@ -2084,45 +1972,30 @@ public:
 		if(closure_sd != NULL)
 			clReleaseMemObject(closure_sd);
 
-		if(closure_sd_dl != NULL)
-			clReleaseMemObject(closure_sd_dl);
-
 		if(closure_sd_shadow != NULL)
 			clReleaseMemObject(closure_sd_shadow);
 
 		if(num_closure_sd != NULL)
 			clReleaseMemObject(num_closure_sd);
 
-		if(num_closure_sd_dl != NULL)
-			clReleaseMemObject(num_closure_sd_dl);
-
 		if(num_closure_sd_shadow != NULL)
 			clReleaseMemObject(num_closure_sd_shadow);
 
 		if(randb_closure_sd != NULL)
 			clReleaseMemObject(randb_closure_sd);
 
-		if(randb_closure_sd_dl != NULL)
-			clReleaseMemObject(randb_closure_sd_dl);
-
 		if(randb_closure_sd_shadow != NULL)
 			clReleaseMemObject(randb_closure_sd_shadow);
 
 		if(ray_P_sd != NULL)
 			clReleaseMemObject(ray_P_sd);
 
-		if(ray_P_sd_dl != NULL)
-			clReleaseMemObject(ray_P_sd_dl);
-
 		if(ray_P_sd_shadow != NULL)
 			clReleaseMemObject(ray_P_sd_shadow);
 
 		if(ray_dP_sd != NULL)
 			clReleaseMemObject(ray_dP_sd);
 
-		if(ray_dP_sd_dl != NULL)
-			clReleaseMemObject(ray_dP_sd_dl);
-
 		if(ray_dP_sd_shadow != NULL)
 			clReleaseMemObject(ray_dP_sd_shadow);
 
@@ -2500,135 +2373,90 @@ public:
 			P_sd = clCreateBuffer(cxContext, CL_MEM_READ_WRITE, num_global_elements * sizeof(float3), NULL, &ciErr);
 			assert(ciErr == CL_SUCCESS && "Can't create P_sd memory");
 
-			P_sd_dl = clCreateBuffer(cxContext, CL_MEM_READ_WRITE, num_global_elements *sizeof(float3), NULL, &ciErr);
-			assert(ciErr == CL_SUCCESS && "Can't create P_sd_dl memory");
-
 			P_sd_shadow = clCreateBuffer(cxContext, CL_MEM_READ_WRITE, num_global_elements * 2 * sizeof(float3), NULL, &ciErr);
 			assert(ciErr == CL_SUCCESS && "Can't create P_sd_shadow memory");
 
 			N_sd = clCreateBuffer(cxContext, CL_MEM_READ_WRITE, num_global_elements * sizeof(float3), NULL, &ciErr);
 			assert(ciErr == CL_SUCCESS && "Can't create N_sd memory");
 
-			N_sd_dl = clCreateBuffer(cxContext, CL_MEM_READ_WRITE, num_global_elements * sizeof(float3), NULL, &ci

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list