diff options
author | Patrick Mours <pmours@nvidia.com> | 2022-03-23 18:07:43 +0300 |
---|---|---|
committer | Patrick Mours <pmours@nvidia.com> | 2022-03-23 18:39:05 +0300 |
commit | d350976ba06d4ef93aa53fc4cd9da57be46ae924 (patch) | |
tree | 808f38e6b0c663c7a50f1d98619c96ca0bd82018 /intern/cycles/integrator | |
parent | 827e9ccb29dd50d155972444d608c35cf4698d6a (diff) |
Cycles: Add Hydra render delegate
This patch adds a Hydra render delegate to Cycles, allowing Cycles to be used for rendering
in applications that provide a Hydra viewport. The implementation was written from scratch
against Cycles X, for integration into the Blender repository to make it possible to continue
developing it in step with the rest of Cycles. For this purpose it follows the style of the rest of
the Cycles code and can be built with a CMake option
(`WITH_CYCLES_HYDRA_RENDER_DELEGATE=1`) similar to the existing standalone version
of Cycles.
Since Hydra render delegates need to be built against the exact USD version and other
dependencies as the target application is using, this is intended to be built separate from
Blender (`WITH_BLENDER=0` CMake option) and with support for library versions different
from what Blender is using. As such the CMake build scripts for Windows had to be modified
slightly, so that the Cycles Hydra render delegate can e.g. be built with MSVC 2017 again
even though Blender requires MSVC 2019 now, and it's possible to specify custom paths to
the USD SDK etc. The codebase supports building against the latest USD release 22.03 and all
the way back to USD 20.08 (with some limitations).
Reviewed By: brecht, LazyDodo
Differential Revision: https://developer.blender.org/D14398
Diffstat (limited to 'intern/cycles/integrator')
-rw-r--r-- | intern/cycles/integrator/render_scheduler.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/intern/cycles/integrator/render_scheduler.cpp b/intern/cycles/integrator/render_scheduler.cpp index 90a5a01320b..a75662c90d8 100644 --- a/intern/cycles/integrator/render_scheduler.cpp +++ b/intern/cycles/integrator/render_scheduler.cpp @@ -20,7 +20,7 @@ RenderScheduler::RenderScheduler(TileManager &tile_manager, const SessionParams background_(params.background), pixel_size_(params.pixel_size), tile_manager_(tile_manager), - default_start_resolution_divider_(pixel_size_ * 8) + default_start_resolution_divider_(params.use_resolution_divider ? pixel_size_ * 8 : 0) { use_progressive_noise_floor_ = !background_; } @@ -119,7 +119,7 @@ void RenderScheduler::reset(const BufferParams &buffer_params, int num_samples, /* In background mode never do lower resolution render preview, as it is not really supported * by the software. */ - if (background_) { + if (background_ || start_resolution_divider_ == 0) { state_.resolution_divider = 1; } else { @@ -1050,6 +1050,10 @@ bool RenderScheduler::work_need_rebalance() void RenderScheduler::update_start_resolution_divider() { + if (default_start_resolution_divider_ == 0) { + return; + } + if (start_resolution_divider_ == 0) { /* Resolution divider has never been calculated before: use default resolution, so that we have * somewhat good initial behavior, giving a chance to collect real numbers. */ |