blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Cycles: Reload kernels from Session when requested features change 

This fixes T49496.
This commit is contained in:
Mai Lavelle 2017-05-17 22:14:12 -04:00
parent b6f5e8d9a1
commit 177385dc43
Notes: blender-bot 2023-02-14 08:33:26 +01:00 
Referenced by issue #49496, adding features in Viewport render with OpenCL doesn't trigger a kernel recompile anymore
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -726,16 +726,20 @@ DeviceRequestedFeatures Session::get_requested_device_features()
return requested_features;
}
void Session::load_kernels()
void Session::load_kernels(bool lock_scene)
{
thread_scoped_lock scene_lock(scene->mutex);
thread_scoped_lock scene_lock;
if(lock_scene) {
scene_lock = thread_scoped_lock(scene->mutex);
}
if(!kernels_loaded) {
DeviceRequestedFeatures requested_features = get_requested_device_features();
if(!kernels_loaded || loaded_kernel_features.modified(requested_features)) {
progress.set_status("Loading render kernels (may take a few minutes the first time)");
scoped_timer timer;
DeviceRequestedFeatures requested_features = get_requested_device_features();
VLOG(2) << "Requested features:\n" << requested_features;
if(!device->load_kernels(requested_features)) {
string message = device->error_message();
@ -752,6 +756,7 @@ void Session::load_kernels()
VLOG(1) << "Total time spent loading kernels: " << time_dt() - timer.get_start();
kernels_loaded = true;
loaded_kernel_features = requested_features;
}
}
@ -902,6 +907,8 @@ void Session::update_scene()
/* update scene */
if(scene->need_update()) {
load_kernels(false);
progress.set_status("Updating Scene");
MEM_GUARDED_CALL(&progress, scene->device_update, device, progress);
}

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

@ -158,7 +158,7 @@ public:
void set_pause(bool pause);
void update_scene();
void load_kernels();
void load_kernels(bool lock_scene=true);
void device_free();
@ -215,6 +215,7 @@ protected:
thread_mutex display_mutex;
bool kernels_loaded;
DeviceRequestedFeatures loaded_kernel_features;
double reset_time;