archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Enhanced performance for Disney materials without subsurface scattering

Browse Source
This commit is contained in:
Pascal Schön
2016-09-26 12:35:36 +02:00
parent 3cd5eb56cf
commit 4d3a0032ec
1 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
intern/cycles/kernel/svm/svm_closure.h
View File

@@ -149,7 +149,25 @@ ccl_device void svm_node_closure_bsdf(KernelGlobals *kg, ShaderData *sd, float *
if (path_flag & PATH_RAY_DIFFUSE_ANCESTOR) if (path_flag & PATH_RAY_DIFFUSE_ANCESTOR)
subsurface = 0.0f; subsurface = 0.0f;
if (subsurf_sample_weight > CLOSURE_WEIGHT_CUTOFF) { if (subsurface < CLOSURE_WEIGHT_CUTOFF) {
/* diffuse */
if (diffuse_weight > CLOSURE_WEIGHT_CUTOFF && fabsf(average(baseColor)) > CLOSURE_WEIGHT_CUTOFF) {
float3 diff_weight = weight * diffuse_weight;
float diff_sample_weight = fabsf(average(diff_weight));
DisneyDiffuseBsdf *bsdf = (DisneyDiffuseBsdf*)bsdf_alloc(sd, sizeof(DisneyDiffuseBsdf), diff_weight);
if (bsdf) {
bsdf->N = N;
bsdf->baseColor = baseColor;
bsdf->roughness = roughness;
/* setup bsdf */
ccl_fetch(sd, flag) |= bsdf_disney_diffuse_setup(bsdf);
}
}
}
else if (subsurf_sample_weight > CLOSURE_WEIGHT_CUTOFF) {
/* radius * scale */ /* radius * scale */
float3 radius = make_float3(1.0f, 1.0f, 1.0f) * subsurface; float3 radius = make_float3(1.0f, 1.0f, 1.0f) * subsurface;
/* sharpness */ /* sharpness */
@@ -239,7 +257,7 @@ ccl_device void svm_node_closure_bsdf(KernelGlobals *kg, ShaderData *sd, float *
#ifdef __CAUSTICS_TRICKS__ #ifdef __CAUSTICS_TRICKS__
if (kernel_data.integrator.caustics_reflective || (path_flag & PATH_RAY_DIFFUSE) == 0) { if (kernel_data.integrator.caustics_reflective || (path_flag & PATH_RAY_DIFFUSE) == 0) {
#endif #endif
if (specular > CLOSURE_WEIGHT_CUTOFF || metallic > CLOSURE_WEIGHT_CUTOFF) { if (specular_weight > CLOSURE_WEIGHT_CUTOFF && (specular > CLOSURE_WEIGHT_CUTOFF || metallic > CLOSURE_WEIGHT_CUTOFF)) {
float3 spec_weight = weight * specular_weight/* * (specular * (1.0f - metallic) + metallic)*/; float3 spec_weight = weight * specular_weight/* * (specular * (1.0f - metallic) + metallic)*/;
MicrofacetBsdf *bsdf = (MicrofacetBsdf*)bsdf_alloc(sd, sizeof(MicrofacetBsdf), spec_weight); MicrofacetBsdf *bsdf = (MicrofacetBsdf*)bsdf_alloc(sd, sizeof(MicrofacetBsdf), spec_weight);