From ca6f53d15ea9273eb396f7b2c0d1b611ce6b7d0a Mon Sep 17 00:00:00 2001 From: Alexander Gavrilov Date: Tue, 2 Aug 2016 12:08:04 +0300 Subject: Cycles: tweak some folding tests to avoid unnecessary type conversion. It's easy to connect a simple value to output without forcing conversion to color by using the Strength socket of Emission. --- intern/cycles/test/render_graph_finalize_test.cpp | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'intern/cycles/test') diff --git a/intern/cycles/test/render_graph_finalize_test.cpp b/intern/cycles/test/render_graph_finalize_test.cpp index e329384021a..cf4083c23db 100644 --- a/intern/cycles/test/render_graph_finalize_test.cpp +++ b/intern/cycles/test/render_graph_finalize_test.cpp @@ -140,6 +140,14 @@ public: .output_closure("EmissionNode::Emission"); } + ShaderGraphBuilder& output_value(const string& from) + { + return (*this) + .add_node(ShaderNodeBuilder("EmissionNode")) + .add_connection(from, "EmissionNode::Strength") + .output_closure("EmissionNode::Emission"); + } + protected: ShaderGraph *graph_; map node_map_; @@ -955,7 +963,7 @@ TEST(render_graph, constant_fold_math) .set(&MathNode::use_clamp, false) .set("Value1", 0.7f) .set("Value2", 0.9f)) - .output_color("Math::Value"); + .output_value("Math::Value"); graph.finalize(&scene); } @@ -976,7 +984,7 @@ TEST(render_graph, constant_fold_math_clamp) .set(&MathNode::use_clamp, true) .set("Value1", 0.7f) .set("Value2", 0.9f)) - .output_color("Math::Value"); + .output_value("Math::Value"); graph.finalize(&scene); } @@ -1007,7 +1015,7 @@ static void build_math_partial_test_graph(ShaderGraphBuilder &builder, NodeMath .set(&MathNode::use_clamp, true)) .add_connection("Math_Cx::Value", "Out::Value1") .add_connection("Math_xC::Value", "Out::Value2") - .output_color("Out::Value"); + .output_value("Out::Value"); } /* -- cgit v1.2.3