1 files changed, 12 insertions, 5 deletions

diff --git a/intern/cycles/render/svm.cpp b/intern/cycles/render/svm.cpp
index 88714e20a90..b2bc17aec19 100644
--- a/intern/cycles/render/svm.cpp
+++ b/intern/cycles/render/svm.cpp
@@ -23,6 +23,7 @@
 #include "render/nodes.h"
 #include "render/scene.h"
 #include "render/shader.h"
+#include "render/stats.h"
 #include "render/svm.h"
 
 #include "util/util_foreach.h"
@@ -76,6 +77,12 @@ void SVMShaderManager::device_update(Device *device,
   if (!need_update)
     return;
 
+  scoped_callback_timer timer([scene](double time) {
+    if (scene->update_stats) {
+      scene->update_stats->svm.times.add_entry({"device_update", time});
+    }
+  });
+
   const int num_shaders = scene->shaders.size();
 
   VLOG(1) << "Total " << num_shaders << " shaders.";
@@ -116,8 +123,8 @@ void SVMShaderManager::device_update(Device *device,
   for (int i = 0; i < num_shaders; i++) {
     Shader *shader = scene->shaders[i];
 
-    shader->need_update = false;
-    if (shader->use_mis && shader->has_surface_emission) {
+    shader->clear_modified();
+    if (shader->get_use_mis() && shader->has_surface_emission) {
       scene->light_manager->need_update = true;
     }
 
@@ -742,7 +749,7 @@ void SVMCompiler::compile_type(Shader *shader, ShaderGraph *graph, ShaderType ty
 
   /* for the bump shader we need add a node to store the shader state */
   bool need_bump_state = (type == SHADER_TYPE_BUMP) &&
-                         (shader->displacement_method == DISPLACE_BOTH);
+                         (shader->get_displacement_method() == DISPLACE_BOTH);
   int bump_state_offset = SVM_STACK_INVALID;
   if (need_bump_state) {
     bump_state_offset = stack_find_offset(SVM_BUMP_EVAL_STATE_SIZE);
@@ -833,7 +840,7 @@ void SVMCompiler::compile(Shader *shader, array<int4> &svm_nodes, int index, Sum
 
   const double time_start = time_dt();
 
-  bool has_bump = (shader->displacement_method != DISPLACE_TRUE) &&
+  bool has_bump = (shader->get_displacement_method() != DISPLACE_TRUE) &&
                   output->input("Surface")->link && output->input("Displacement")->link;
 
   /* finalize */
@@ -842,7 +849,7 @@ void SVMCompiler::compile(Shader *shader, array<int4> &svm_nodes, int index, Sum
     shader->graph->finalize(scene,
                             has_bump,
                             shader->has_integrator_dependency,
-                            shader->displacement_method == DISPLACE_BOTH);
+                            shader->get_displacement_method() == DISPLACE_BOTH);
   }
 
   current_shader = shader;