1 files changed, 22 insertions, 37 deletions

diff --git a/intern/cycles/render/svm.cpp b/intern/cycles/render/svm.cpp
index a670ceb3ea3..2379eb775a0 100644
--- a/intern/cycles/render/svm.cpp
+++ b/intern/cycles/render/svm.cpp
@@ -47,10 +47,10 @@ void SVMShaderManager::reset(Scene * /*scene*/)
 {
 }
 
-static void host_compile_shader(Scene *scene,
-                                Shader *shader,
-                                Progress *progress,
-                                array<int4> *svm_nodes)
+void SVMShaderManager::device_update_shader(Scene *scene,
+                                            Shader *shader,
+                                            Progress *progress,
+                                            array<int4> *svm_nodes)
 {
   if (progress->get_cancel()) {
     return;
@@ -69,32 +69,6 @@ static void host_compile_shader(Scene *scene,
           << summary.full_report();
 }
 
-void SVMShaderManager::host_update_specific(Scene *scene, Progress &progress)
-{
-  if (!need_update()) {
-    return;
-  }
-
-  scoped_callback_timer timer([scene](double time) {
-    if (scene->update_stats) {
-      scene->update_stats->svm.times.add_entry({"host_update", time});
-    }
-  });
-
-  const int num_shaders = scene->shaders.size();
-
-  VLOG(1) << "Total " << num_shaders << " shaders.";
-
-  /* Build all shaders. */
-  TaskPool task_pool;
-  shader_svm_nodes_.resize(num_shaders);
-  for (int i = 0; i < num_shaders; i++) {
-    task_pool.push(function_bind(
-        host_compile_shader, scene, scene->shaders[i], &progress, &shader_svm_nodes_[i]));
-  }
-  task_pool.wait_work();
-}
-
 void SVMShaderManager::device_update_specific(Device *device,
                                               DeviceScene *dscene,
                                               Scene *scene,
@@ -118,6 +92,19 @@ void SVMShaderManager::device_update_specific(Device *device,
   /* test if we need to update */
   device_free(device, dscene, scene);
 
+  /* Build all shaders. */
+  TaskPool task_pool;
+  vector<array<int4>> shader_svm_nodes(num_shaders);
+  for (int i = 0; i < num_shaders; i++) {
+    task_pool.push(function_bind(&SVMShaderManager::device_update_shader,
+                                 this,
+                                 scene,
+                                 scene->shaders[i],
+                                 &progress,
+                                 &shader_svm_nodes[i]));
+  }
+  task_pool.wait_work();
+
   if (progress.get_cancel()) {
     return;
   }
@@ -127,7 +114,7 @@ void SVMShaderManager::device_update_specific(Device *device,
   int svm_nodes_size = num_shaders;
   for (int i = 0; i < num_shaders; i++) {
     /* Since we're not copying the local jump node, the size ends up being one node lower. */
-    svm_nodes_size += shader_svm_nodes_[i].size() - 1;
+    svm_nodes_size += shader_svm_nodes[i].size() - 1;
   }
 
   int4 *svm_nodes = dscene->svm_nodes.alloc(svm_nodes_size);
@@ -145,22 +132,22 @@ void SVMShaderManager::device_update_specific(Device *device,
      * Each compiled shader starts with a jump node that has offsets local
      * to the shader, so copy those and add the offset into the global node list. */
     int4 &global_jump_node = svm_nodes[shader->id];
-    int4 &local_jump_node = shader_svm_nodes_[i][0];
+    int4 &local_jump_node = shader_svm_nodes[i][0];
 
     global_jump_node.x = NODE_SHADER_JUMP;
     global_jump_node.y = local_jump_node.y - 1 + node_offset;
     global_jump_node.z = local_jump_node.z - 1 + node_offset;
     global_jump_node.w = local_jump_node.w - 1 + node_offset;
 
-    node_offset += shader_svm_nodes_[i].size() - 1;
+    node_offset += shader_svm_nodes[i].size() - 1;
   }
 
   /* Copy the nodes of each shader into the correct location. */
   svm_nodes += num_shaders;
   for (int i = 0; i < num_shaders; i++) {
-    int shader_size = shader_svm_nodes_[i].size() - 1;
+    int shader_size = shader_svm_nodes[i].size() - 1;
 
-    memcpy(svm_nodes, &shader_svm_nodes_[i][1], sizeof(int4) * shader_size);
+    memcpy(svm_nodes, &shader_svm_nodes[i][1], sizeof(int4) * shader_size);
     svm_nodes += shader_size;
   }
 
@@ -174,8 +161,6 @@ void SVMShaderManager::device_update_specific(Device *device,
 
   update_flags = UPDATE_NONE;
 
-  shader_svm_nodes_.clear();
-
   VLOG(1) << "Shader manager updated " << num_shaders << " shaders in " << time_dt() - start_time
           << " seconds.";
 }