diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-02-19 19:44:58 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-03-17 14:01:19 +0300 |
commit | 7778a1a0a12fc026dc5bcc2c195b9460d1c77b53 (patch) | |
tree | f680fdee39ac648faa17dd145e0c521c5bea72fa /intern/cycles/render/shader.cpp | |
parent | 9c7517fb636da9c5a8b4eead09957f29db1a6687 (diff) |
Cycles: optimization for constant background colors.
Skip shader evaluation then, as we already do for lights. Less than
1% faster in my tests, but might as well be consistent for both.
Diffstat (limited to 'intern/cycles/render/shader.cpp')
-rw-r--r-- | intern/cycles/render/shader.cpp | 31 |
1 files changed, 24 insertions, 7 deletions
diff --git a/intern/cycles/render/shader.cpp b/intern/cycles/render/shader.cpp index 9f256a665cd..0f40ab7b15f 100644 --- a/intern/cycles/render/shader.cpp +++ b/intern/cycles/render/shader.cpp @@ -219,20 +219,37 @@ bool Shader::is_constant_emission(float3 *emission) { ShaderInput *surf = graph->output()->input("Surface"); - if(!surf->link || surf->link->parent->type != EmissionNode::node_type) { + if(surf->link == NULL) { return false; } - EmissionNode *node = (EmissionNode*) surf->link->parent; + if(surf->link->parent->type == EmissionNode::node_type) { + EmissionNode *node = (EmissionNode*) surf->link->parent; - assert(node->input("Color")); - assert(node->input("Strength")); + assert(node->input("Color")); + assert(node->input("Strength")); - if(node->input("Color")->link || node->input("Strength")->link) { - return false; + if(node->input("Color")->link || node->input("Strength")->link) { + return false; + } + + *emission = node->color*node->strength; } + else if(surf->link->parent->type == BackgroundNode::node_type) { + BackgroundNode *node = (BackgroundNode*) surf->link->parent; - *emission = node->color*node->strength; + assert(node->input("Color")); + assert(node->input("Strength")); + + if(node->input("Color")->link || node->input("Strength")->link) { + return false; + } + + *emission = node->color*node->strength; + } + else { + return false; + } return true; } |