Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brecht@blender.org>2022-04-29 18:26:56 +0300
committerBrecht Van Lommel <brecht@blender.org>2022-04-29 18:39:04 +0300
commit0c317e23bff87e5ea2d908e480ae04eac1b7e2f8 (patch)
treed5ef1eddce932de167d7f9e8cb5dc5fce2432ce4 /intern/cycles/integrator
parent5d84d9b0d6ad114109d60cf3d0ddcd9bb1a5de13 (diff)
Cleanup: fix various Cycles build warnings with non-default options
* Float/double promotion warnings were mainly meant for avoiding slow operatiosn in the kernel. Limit it to that to avoid hard to fix warnings in Hydra. * Const warnings in Hydra iterators. * Unused variable warnings when building without glog. * Wrong camera enum comparisons in assert. * PASS_UNUSED is not a pass type, only for pass offsets.
Diffstat (limited to 'intern/cycles/integrator')
-rw-r--r--intern/cycles/integrator/path_trace.cpp24
1 files changed, 11 insertions, 13 deletions
diff --git a/intern/cycles/integrator/path_trace.cpp b/intern/cycles/integrator/path_trace.cpp
index 4ecd3b829e8..36a0326e405 100644
--- a/intern/cycles/integrator/path_trace.cpp
+++ b/intern/cycles/integrator/path_trace.cpp
@@ -647,8 +647,6 @@ void PathTrace::update_display(const RenderWork &render_work)
void PathTrace::rebalance(const RenderWork &render_work)
{
- static const int kLogLevel = 3;
-
if (!render_work.rebalance) {
return;
}
@@ -656,33 +654,33 @@ void PathTrace::rebalance(const RenderWork &render_work)
const int num_works = path_trace_works_.size();
if (num_works == 1) {
- VLOG(kLogLevel) << "Ignoring rebalance work due to single device render.";
+ VLOG(3) << "Ignoring rebalance work due to single device render.";
return;
}
const double start_time = time_dt();
- if (VLOG_IS_ON(kLogLevel)) {
- VLOG(kLogLevel) << "Perform rebalance work.";
- VLOG(kLogLevel) << "Per-device path tracing time (seconds):";
+ if (VLOG_IS_ON(3)) {
+ VLOG(3) << "Perform rebalance work.";
+ VLOG(3) << "Per-device path tracing time (seconds):";
for (int i = 0; i < num_works; ++i) {
- VLOG(kLogLevel) << path_trace_works_[i]->get_device()->info.description << ": "
- << work_balance_infos_[i].time_spent;
+ VLOG(3) << path_trace_works_[i]->get_device()->info.description << ": "
+ << work_balance_infos_[i].time_spent;
}
}
const bool did_rebalance = work_balance_do_rebalance(work_balance_infos_);
- if (VLOG_IS_ON(kLogLevel)) {
- VLOG(kLogLevel) << "Calculated per-device weights for works:";
+ if (VLOG_IS_ON(3)) {
+ VLOG(3) << "Calculated per-device weights for works:";
for (int i = 0; i < num_works; ++i) {
- VLOG(kLogLevel) << path_trace_works_[i]->get_device()->info.description << ": "
- << work_balance_infos_[i].weight;
+ VLOG(3) << path_trace_works_[i]->get_device()->info.description << ": "
+ << work_balance_infos_[i].weight;
}
}
if (!did_rebalance) {
- VLOG(kLogLevel) << "Balance in path trace works did not change.";
+ VLOG(3) << "Balance in path trace works did not change.";
render_scheduler_.report_rebalance_time(render_work, time_dt() - start_time, false);
return;
}