Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Revert r50528: "Performance fix for Cycles: Don't wait in the main UI thread when resetting devices."

Browse Source 
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.
This commit is contained in:
Lukas Toenne
2012-09-17 12:07:06 +00:00
parent aecb2f7039
commit efaf512406
9 changed files with 16 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
intern/cycles/render/session.h
View File

@@ -116,7 +116,6 @@ public:
bool ready_to_reset();
void reset(BufferParams& params, int samples);
bool resetting() const;
void set_samples(int samples);
void set_pause(bool pause);
@@ -140,12 +139,10 @@ protected:
void run_cpu();
bool draw_cpu(BufferParams& params);
void reset_cpu(BufferParams& params, int samples);
bool resetting_cpu() const;
void run_gpu();
bool draw_gpu(BufferParams& params);
void reset_gpu(BufferParams& params, int samples);
bool resetting_gpu() const;
bool acquire_tile(Device *tile_device, RenderTile& tile);
void update_tile_sample(RenderTile& tile);