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

Fix #33152: cycles SVM crash with certain shader nodes setups where closures would

Browse Source 
appear multiple times after flattening the mix/add shader part of the graph into a
tree structure.
This commit is contained in:
Brecht Van Lommel
2012-11-24 14:50:21 +00:00
parent 9b701b7d32
commit ed986b62e8
2 changed files with 83 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -81,6 +81,7 @@ public:
bool background;
protected:
/* stack */
struct Stack {
Stack() { memset(users, 0, sizeof(users)); }
Stack(const Stack& other) { memcpy(users, other.users, sizeof(users)); }
@@ -123,11 +124,22 @@ protected:
bool node_skip_input(ShaderNode *node, ShaderInput *input);
/* single closure */
void find_dependencies(set<ShaderNode*>& dependencies, const set<ShaderNode*>& done, ShaderInput *input);
void generate_svm_nodes(const set<ShaderNode*>& nodes, set<ShaderNode*>& done);
void generate_closure(ShaderNode *node, set<ShaderNode*>& done);
void generate_multi_closure(ShaderNode *node, set<ShaderNode*>& done, uint in_offset);
/* multi closure */
struct MultiClosureData {
int stack_offset;
int users;
};
void generate_multi_closure(ShaderNode *node, set<ShaderNode*>& done,
map<ShaderNode*,MultiClosureData>& closure_data, uint in_offset);
void count_closure_users(ShaderNode *node, map<ShaderNode*, MultiClosureData>& closure_data);
/* compile */
void compile_type(Shader *shader, ShaderGraph *graph, ShaderType type);
vector<int4> svm_nodes;