diff options
| author | Patrick Mours <pmours@nvidia.com> | 2022-04-20 14:40:48 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2022-04-29 20:19:39 +0300 |
| commit | fc2c22e90c252f683a42574d4382f7e3c23940e1 (patch) | |
| tree | 371a8b746554ec7fc5f4d6bf82ad68c972656821 /intern/cycles/hydra/render_delegate.h | |
| parent | 9b92ce9dc00971cd9f7f0d0ba6109a9cba2090bd (diff) | |
Cycles: Hydra fixes for stageMetersPerUnit and OpenGL context on Windows
Add "stageMetersPerUnit" render setting for USD files that have that set to
something other than the default (e.g. exported by Blender).
And fix a crash when an application creates a Hydra render pass on a thread
that does not have an OpenGL context current.
Diffstat (limited to 'intern/cycles/hydra/render_delegate.h')
| -rw-r--r-- | intern/cycles/hydra/render_delegate.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/intern/cycles/hydra/render_delegate.h b/intern/cycles/hydra/render_delegate.h index 7c5ee22e9d6..dc7f21a6481 100644 --- a/intern/cycles/hydra/render_delegate.h +++ b/intern/cycles/hydra/render_delegate.h @@ -11,6 +11,18 @@ HDCYCLES_NAMESPACE_OPEN_SCOPE +// clang-format off +#define HD_CYCLES_RENDER_SETTINGS_TOKENS \ + (stageMetersPerUnit) \ + ((device, "cycles:device")) \ + ((threads, "cycles:threads")) \ + ((timeLimit, "cycles:time_limit")) \ + ((samples, "cycles:samples")) \ + ((sampleOffset, "cycles:sample_offset")) +// clang-format on + +TF_DECLARE_PUBLIC_TOKENS(HdCyclesRenderSettingsTokens, HD_CYCLES_RENDER_SETTINGS_TOKENS); + class HdCyclesDelegate final : public PXR_NS::HdRenderDelegate { public: HdCyclesDelegate(const PXR_NS::HdRenderSettingsMap &settingsMap, |