Page MenuHome
Differential D2593 Diff 8687 intern/cycles/blender/blender_session.cpp

Changeset View

Standalone View

View Options

intern/cycles/blender/blender_session.cpp

Show First 20 Lines • Show All 498 Lines • ▼ Show 20 Lines if(session_params.device.advanced_shading) {
continue; continue;
if(pass_type != PASS_NONE) if(pass_type != PASS_NONE)
Pass::add(pass_type, passes); Pass::add(pass_type, passes);
} }
} }
buffer_params.passes = passes; buffer_params.passes = passes;
buffer_params.denoising_data_pass = b_layer_iter->use_denoising(); buffer_params.denoising_data_pass = b_layer_iter->use_denoising();
session->tile_manager.schedule_denoising = b_layer_iter->use_denoising();
session->params.use_denoising = b_layer_iter->use_denoising();
scene->film->denoising_data_pass = buffer_params.denoising_data_pass; scene->film->denoising_data_pass = buffer_params.denoising_data_pass;
scene->film->denoising_flags = 0; scene->film->denoising_flags = 0;
if(!b_layer_iter->denoising_diffuse_direct()) scene->film->denoising_flags |= DENOISING_CLEAN_DIFFUSE_DIR; if(!b_layer_iter->denoising_diffuse_direct()) scene->film->denoising_flags |= DENOISING_CLEAN_DIFFUSE_DIR;
if(!b_layer_iter->denoising_diffuse_indirect()) scene->film->denoising_flags |= DENOISING_CLEAN_DIFFUSE_IND; if(!b_layer_iter->denoising_diffuse_indirect()) scene->film->denoising_flags |= DENOISING_CLEAN_DIFFUSE_IND;
if(!b_layer_iter->denoising_glossy_direct()) scene->film->denoising_flags |= DENOISING_CLEAN_GLOSSY_DIR; if(!b_layer_iter->denoising_glossy_direct()) scene->film->denoising_flags |= DENOISING_CLEAN_GLOSSY_DIR;
if(!b_layer_iter->denoising_glossy_indirect()) scene->film->denoising_flags |= DENOISING_CLEAN_GLOSSY_IND; if(!b_layer_iter->denoising_glossy_indirect()) scene->film->denoising_flags |= DENOISING_CLEAN_GLOSSY_IND;
if(!b_layer_iter->denoising_transmission_direct()) scene->film->denoising_flags |= DENOISING_CLEAN_TRANSMISSION_DIR; if(!b_layer_iter->denoising_transmission_direct()) scene->film->denoising_flags |= DENOISING_CLEAN_TRANSMISSION_DIR;
if(!b_layer_iter->denoising_transmission_indirect()) scene->film->denoising_flags |= DENOISING_CLEAN_TRANSMISSION_IND; if(!b_layer_iter->denoising_transmission_indirect()) scene->film->denoising_flags |= DENOISING_CLEAN_TRANSMISSION_IND;
if(!b_layer_iter->denoising_subsurface_direct()) scene->film->denoising_flags |= DENOISING_CLEAN_SUBSURFACE_DIR; if(!b_layer_iter->denoising_subsurface_direct()) scene->film->denoising_flags |= DENOISING_CLEAN_SUBSURFACE_DIR;
if(!b_layer_iter->denoising_subsurface_indirect()) scene->film->denoising_flags |= DENOISING_CLEAN_SUBSURFACE_IND; if(!b_layer_iter->denoising_subsurface_indirect()) scene->film->denoising_flags |= DENOISING_CLEAN_SUBSURFACE_IND;
scene->film->denoising_clean_pass = (scene->film->denoising_flags & DENOISING_CLEAN_ALL_PASSES); scene->film->denoising_clean_pass = (scene->film->denoising_flags & DENOISING_CLEAN_ALL_PASSES);
buffer_params.denoising_clean_pass = scene->film->denoising_clean_pass; buffer_params.denoising_clean_pass = scene->film->denoising_clean_pass;
session->params.denoising_radius = b_layer_iter->denoising_radius();
session->params.denoising_k2 = powf(2.0f, b_layer_iter->denoising_strength() - 1.0f);
if(b_layer_iter->denoising_relative_pca()) {
session->params.denoising_pca = -powf(10.0f, b_layer_iter->denoising_feature_strength() - 4.0f);
}
else {
session->params.denoising_pca = powf(10.0f, b_layer_iter->denoising_feature_strength() - 1.0f);
}
brechtUnsubmitted
Done
Inline Actions

Could this be computed in DenoisingTask::init_from_devicetask? So that the code can be shared with non-Blender integrations.

brecht: Could this be computed in `DenoisingTask::init_from_devicetask`? So that the code can be shared…
scene->film->pass_alpha_threshold = b_layer_iter->pass_alpha_threshold(); scene->film->pass_alpha_threshold = b_layer_iter->pass_alpha_threshold();
scene->film->tag_passes_update(scene, passes); scene->film->tag_passes_update(scene, passes);
scene->film->tag_update(scene); scene->film->tag_update(scene);
scene->integrator->tag_update(scene); scene->integrator->tag_update(scene);
int view_index = 0; int view_index = 0;
for(b_rr.views.begin(b_view_iter); b_view_iter != b_rr.views.end(); ++b_view_iter, ++view_index) { for(b_rr.views.begin(b_view_iter); b_view_iter != b_rr.views.end(); ++b_view_iter, ++view_index) {
b_rview_name = b_view_iter->name(); b_rview_name = b_view_iter->name();
▲ Show 20 Lines • Show All 870 Lines • Show Last 20 Lines