Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: Remove unused ray type flags.

Browse Source 
They were added for completeness, but it seems we don't need them.
This commit is contained in:
Thomas Dinges
2015-05-08 12:10:26 +02:00
parent 945e302409
commit 900fc43bb4
4 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
intern/cycles/kernel/kernel_path.h
View File

@@ -273,8 +273,6 @@ ccl_device void kernel_path_indirect(KernelGlobals *kg, RNG *rng, Ray ray,
float bssrdf_u, bssrdf_v;
path_state_rng_2D(kg, rng, &state, PRNG_BSDF_U, &bssrdf_u, &bssrdf_v);
subsurface_scatter_step(kg, &sd, state.flag, sc, &lcg_state, bssrdf_u, bssrdf_v, false);
state.flag |= PATH_RAY_BSSRDF_ANCESTOR;
}
}
#endif
@@ -392,7 +390,6 @@ ccl_device bool kernel_path_subsurface_scatter(KernelGlobals *kg, ShaderData *sd
PathState hit_state = *state;
Ray hit_ray = *ray;
hit_state.flag |= PATH_RAY_BSSRDF_ANCESTOR;
hit_state.rng_offset += PRNG_BOUNCE_NUM;
kernel_path_surface_connect_light(kg, rng, &bssrdf_sd[hit], tp, state, L);
@@ -779,8 +776,6 @@ ccl_device void kernel_branched_path_subsurface_scatter(KernelGlobals *kg,
float num_samples_inv = 1.0f/num_samples;
RNG bssrdf_rng = cmj_hash(*rng, i);
state->flag |= PATH_RAY_BSSRDF_ANCESTOR;
/* do subsurface scatter step with copy of shader data, this will
* replace the BSSRDF with a diffuse BSDF closure */
for(int j = 0; j < num_samples; j++) {
@@ -832,8 +827,6 @@ ccl_device void kernel_branched_path_subsurface_scatter(KernelGlobals *kg,
&hit_state, L);
}
}
state->flag &= ~PATH_RAY_BSSRDF_ANCESTOR;
}
}
#endif

2
intern/cycles/kernel/kernel_path_state.h
View File

@@ -106,7 +106,7 @@ ccl_device_inline void path_state_next(KernelGlobals *kg, PathState *state, int
state->flag &= ~(PATH_RAY_GLOSSY|PATH_RAY_SINGULAR|PATH_RAY_MIS_SKIP);
}
else if(label & LABEL_GLOSSY) {
state->flag |= PATH_RAY_GLOSSY|PATH_RAY_GLOSSY_ANCESTOR;
state->flag |= PATH_RAY_GLOSSY;
state->flag &= ~(PATH_RAY_DIFFUSE|PATH_RAY_SINGULAR|PATH_RAY_MIS_SKIP);
}
else {

4
intern/cycles/kernel/kernel_types.h
View File

@@ -264,9 +264,7 @@ enum PathRayFlag {
PATH_RAY_MIS_SKIP = 2048,
PATH_RAY_DIFFUSE_ANCESTOR = 4096,
PATH_RAY_GLOSSY_ANCESTOR = 8192,
PATH_RAY_BSSRDF_ANCESTOR = 16384,
PATH_RAY_SINGLE_PASS_DONE = 32768,
PATH_RAY_SINGLE_PASS_DONE = 8192,
/* we need layer member flags to be the 20 upper bits */
PATH_RAY_LAYER_SHIFT = (32-20)

6
intern/cycles/render/osl.cpp
View File

@@ -213,9 +213,9 @@ void OSLShaderManager::shading_system_init()
"__unused__",
"__unused__",
"diffuse_ancestor", /* PATH_RAY_DIFFUSE_ANCESTOR */
"glossy_ancestor", /* PATH_RAY_GLOSSY_ANCESTOR */
"bssrdf_ancestor", /* PATH_RAY_BSSRDF_ANCESTOR */
"diffuse_ancestor", /* PATH_RAY_DIFFUSE_ANCESTOR */
"__unused__",
"__unused__",
"__unused__", /* PATH_RAY_SINGLE_PASS_DONE */
"volume_scatter", /* PATH_RAY_VOLUME_SCATTER */
};