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

Cycles: Fix race condition in attributes creation during SVM compilation

Browse Source
This commit is contained in:
Sergey Sharybin
2017-04-05 14:57:54 +02:00
parent 3ce30823ff
commit 52029e689c
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/render/svm.cpp
View File

@@ -393,11 +393,13 @@ void SVMCompiler::add_node(const float4& f)
uint SVMCompiler::attribute(ustring name) uint SVMCompiler::attribute(ustring name)
{ {
thread_scoped_spin_lock lock(attribute_lock_);
return shader_manager->get_attribute_id(name); return shader_manager->get_attribute_id(name);
} }
uint SVMCompiler::attribute(AttributeStandard std) uint SVMCompiler::attribute(AttributeStandard std)
{ {
thread_scoped_spin_lock lock(attribute_lock_);
return shader_manager->get_attribute_id(std); return shader_manager->get_attribute_id(std);
} }

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

@@ -218,6 +218,8 @@ protected:
int max_stack_use; int max_stack_use;
uint mix_weight_offset; uint mix_weight_offset;
bool compile_failed; bool compile_failed;
thread_spin_lock attribute_lock_;
}; };
CCL_NAMESPACE_END CCL_NAMESPACE_END