diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-07-18 16:34:32 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-07-18 17:02:08 +0300 |
| commit | 45b5bf034b053509d7175e74ddea22c658b4717e (patch) | |
| tree | 138826d0ebe72d4985ada1f84e11a392243a5f7f /intern/cycles/device/device.h | |
| parent | 36a952e3e487ede34ece9330a9ae1439364c5bdd (diff) | |
Cycles; Make baking a feature-specific option
This means render devices now might skip building baking kernels in cases when
only actual render-related functionality is used.
For now it's only implemented for OpenCL split kernel device and mainly needed
to work around some compiler-specific bugs which crashes on building the kernel.
Using OpenCL for baking might still crash the driver, but at least there is now
higher probability of that GPU will be usable to render the scene.
Real fix should actually be done in the driver side.
Diffstat (limited to 'intern/cycles/device/device.h')
| -rw-r--r-- | intern/cycles/device/device.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/intern/cycles/device/device.h b/intern/cycles/device/device.h index 6b4a190bbf0..7c4f5b61a48 100644 --- a/intern/cycles/device/device.h +++ b/intern/cycles/device/device.h @@ -97,6 +97,9 @@ public: bool use_object_motion; bool use_camera_motion; + /* Denotes whether baking functionality is needed. */ + bool use_baking; + DeviceRequestedFeatures() { /* TODO(sergey): Find more meaningful defaults. */ @@ -107,6 +110,7 @@ public: use_hair = false; use_object_motion = false; use_camera_motion = false; + use_baking = false; } bool modified(const DeviceRequestedFeatures& requested_features) @@ -114,7 +118,11 @@ public: return !(experimental == requested_features.experimental && max_closure == requested_features.max_closure && max_nodes_group == requested_features.max_nodes_group && - nodes_features == requested_features.nodes_features); + nodes_features == requested_features.nodes_features && + use_hair == requested_features.use_hair && + use_object_motion == requested_features.use_object_motion && + use_camera_motion == requested_features.use_camera_motion && + use_baking == requested_features.use_baking); } }; |