[Bf-blender-cvs] [6e859f7ff89] master: Fix invalid OSL shader compilation state

[Sergey Sharybin]

Commit: 6e859f7ff8906766ab19d46d06e2c131301d266d
Author: Sergey Sharybin
Date:   Tue Oct 19 11:09:11 2021 +0200
Branches: master
https://developer.blender.org/rB6e859f7ff8906766ab19d46d06e2c131301d266d

Fix invalid OSL shader compilation state

The lookup tables are to be initialized after device free.

On Linux was only noticeable when rendering default cube scene with
an extra assert. On Windows it was causing an assert in STL in debug
builds.

Differential Revision: https://developer.blender.org/D12918

===================================================================

M	intern/cycles/render/osl.cpp
M	intern/cycles/render/osl.h

===================================================================

diff --git a/intern/cycles/render/osl.cpp b/intern/cycles/render/osl.cpp
index b6c743ac295..ef24c1876f3 100644
--- a/intern/cycles/render/osl.cpp
+++ b/intern/cycles/render/osl.cpp
@@ -91,7 +91,7 @@ void OSLShaderManager::reset(Scene * /*scene*/)
   shading_system_init();
 }
 
-void OSLShaderManager::host_update_specific(Device *device, Scene *scene, Progress &progress)
+void OSLShaderManager::host_update_specific(Device * /*device*/, Scene *scene, Progress &progress)
 {
   if (!need_update()) {
     return;
@@ -109,7 +109,6 @@ void OSLShaderManager::host_update_specific(Device *device, Scene *scene, Progre
   scene->image_manager->set_osl_texture_system((void *)ts);
 
   /* create shaders */
-  OSLGlobals *og = (OSLGlobals *)device->get_cpu_osl_memory();
   Shader *background_shader = scene->background->get_shader(scene);
 
   for (Shader *shader : scene->shaders) {
@@ -126,7 +125,7 @@ void OSLShaderManager::host_update_specific(Device *device, Scene *scene, Progre
 
     OSLCompiler compiler(this, services, ss, scene);
     compiler.background = (shader == background_shader);
-    compiler.compile(og, shader);
+    compiler.compile(shader);
 
     if (shader->get_use_mis() && shader->has_surface_emission) {
       scene->light_manager->tag_update(scene, LightManager::SHADER_COMPILED);
@@ -178,14 +177,22 @@ void OSLShaderManager::device_update_specific(Device *device,
   og->ts = ts;
   og->services = services;
 
-  const int background_id = scene->shader_manager->get_shader_id(background_shader);
-  og->background_state = og->surface_state[background_id & SHADER_MASK];
-  og->use = true;
+  for (Shader *shader : scene->shaders) {
+    /* push state to array for lookup */
+    og->surface_state.push_back(shader->osl_surface_ref);
+    og->volume_state.push_back(shader->osl_volume_ref);
+    og->displacement_state.push_back(shader->osl_displacement_ref);
+    og->bump_state.push_back(shader->osl_surface_bump_ref);
 
-  foreach (Shader *shader, scene->shaders) {
     shader->clear_modified();
   }
 
+  const int background_id = scene->shader_manager->get_shader_id(background_shader);
+  const int background_state_index = (background_id & SHADER_MASK);
+  DCHECK_LT(background_state_index, og->surface_state.size());
+  og->background_state = og->surface_state[background_state_index];
+  og->use = true;
+
   update_flags = UPDATE_NONE;
 
   device_update_common(device, dscene, scene, progress);
@@ -1151,7 +1158,7 @@ OSL::ShaderGroupRef OSLCompiler::compile_type(Shader *shader, ShaderGraph *graph
   return group;
 }
 
-void OSLCompiler::compile(OSLGlobals *og, Shader *shader)
+void OSLCompiler::compile(Shader *shader)
 {
   if (shader->is_modified()) {
     ShaderGraph *graph = shader->graph;
@@ -1213,12 +1220,6 @@ void OSLCompiler::compile(OSLGlobals *og, Shader *shader)
     else
       shader->osl_displacement_ref = OSL::ShaderGroupRef();
   }
-
-  /* push state to array for lookup */
-  og->surface_state.push_back(shader->osl_surface_ref);
-  og->volume_state.push_back(shader->osl_volume_ref);
-  og->displacement_state.push_back(shader->osl_displacement_ref);
-  og->bump_state.push_back(shader->osl_surface_bump_ref);
 }
 
 void OSLCompiler::parameter_texture(const char *name, ustring filename, ustring colorspace)
diff --git a/intern/cycles/render/osl.h b/intern/cycles/render/osl.h
index 019dca16df7..7b7b8cc8dc5 100644
--- a/intern/cycles/render/osl.h
+++ b/intern/cycles/render/osl.h
@@ -140,7 +140,7 @@ class OSLCompiler {
               OSL::ShadingSystem *shadingsys,
               Scene *scene);
 #endif
-  void compile(OSLGlobals *og, Shader *shader);
+  void compile(Shader *shader);
 
   void add(ShaderNode *node, const char *name, bool isfilepath = false);