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

Fix #30246: rendering multiple render layers with CUDA still not working,

Browse Source 
should really be fixed now.
This commit is contained in:
Brecht Van Lommel
2012-02-23 19:48:18 +00:00
parent 2254d2bdca
commit c4b64343d0
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
intern/cycles/render/session.cpp
View File

@@ -57,6 +57,7 @@ Session::Session(const SessionParams& params_)
gpu_draw_ready = false; gpu_draw_ready = false;
gpu_need_tonemap = false; gpu_need_tonemap = false;
pause = false; pause = false;
kernels_loaded = false;
} }
Session::~Session() Session::~Session()
@@ -414,16 +415,20 @@ void Session::run_cpu()
void Session::run() void Session::run()
{ {
/* load kernels */ /* load kernels */
progress.set_status("Loading render kernels (may take a few minutes the first time)"); if(!kernels_loaded) {
progress.set_status("Loading render kernels (may take a few minutes the first time)");
if(!device->load_kernels(params.experimental)) { if(!device->load_kernels(params.experimental)) {
string message = device->error_message(); string message = device->error_message();
if(message == "") if(message == "")
message = "Failed loading render kernel, see console for errors"; message = "Failed loading render kernel, see console for errors";
progress.set_status("Error", message); progress.set_status("Error", message);
progress.set_update(); progress.set_update();
return; return;
}
kernels_loaded = true;
} }
/* session thread loop */ /* session thread loop */

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

@@ -156,6 +156,8 @@ protected:
thread_condition_variable pause_cond; thread_condition_variable pause_cond;
thread_mutex pause_mutex; thread_mutex pause_mutex;
bool kernels_loaded;
double start_time; double start_time;
double reset_time; double reset_time;
double preview_time; double preview_time;