diff options
| author | Lukas Toenne <lukas.toenne@googlemail.com> | 2012-09-17 16:07:06 +0400 |
|---|---|---|
| committer | Lukas Toenne <lukas.toenne@googlemail.com> | 2012-09-17 16:07:06 +0400 |
| commit | efaf512406c71606d7f05eca10c74510bd9ebc12 (patch) | |
| tree | d42a01041ba165f13ad1b3c42bc118bd3c82b0c3 /intern/cycles/render/session.cpp | |
| parent | aecb2f7039f0af91bd1eb03a64957bcd532c9408 (diff) | |
Revert r50528: "Performance fix for Cycles: Don't wait in the main UI thread when resetting devices."
This commit leads to random freezes in Cycles rendering:
https://projects.blender.org/tracker/index.php?func=detail&aid=32545&group_id=9&atid=498
The goal of this commit was to remove UI lag for OSL, but since that is not officially supported yet, better revert it until a proper fix can be implemented in 2.65.
Diffstat (limited to 'intern/cycles/render/session.cpp')
| -rw-r--r-- | intern/cycles/render/session.cpp | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp index b190cdfec96..cd410e4e011 100644 --- a/intern/cycles/render/session.cpp +++ b/intern/cycles/render/session.cpp @@ -140,12 +140,6 @@ void Session::reset_gpu(BufferParams& buffer_params, int samples) pause_cond.notify_all(); } -bool Session::resetting_gpu() const -{ - /* no need to wait for gpu device */ - return false; -} - bool Session::draw_gpu(BufferParams& buffer_params) { /* block for buffer access */ @@ -296,11 +290,6 @@ void Session::reset_cpu(BufferParams& buffer_params, int samples) pause_cond.notify_all(); } -bool Session::resetting_cpu() const -{ - return device->task_cancelled(); -} - bool Session::draw_cpu(BufferParams& buffer_params) { thread_scoped_lock display_lock(display_mutex); @@ -595,14 +584,6 @@ void Session::reset(BufferParams& buffer_params, int samples) reset_cpu(buffer_params, samples); } -bool Session::resetting() const -{ - if(device_use_gl) - return resetting_gpu(); - else - return resetting_cpu(); -} - void Session::set_samples(int samples) { if(samples != params.samples) { |