diff options
Diffstat (limited to 'intern/cycles/render')
-rw-r--r-- | intern/cycles/render/graph.cpp | 2 | ||||
-rw-r--r-- | intern/cycles/render/nodes.cpp | 24 | ||||
-rw-r--r-- | intern/cycles/render/nodes.h | 5 |
3 files changed, 3 insertions, 28 deletions
diff --git a/intern/cycles/render/graph.cpp b/intern/cycles/render/graph.cpp index 2b01662a3f8..3a9e2981418 100644 --- a/intern/cycles/render/graph.cpp +++ b/intern/cycles/render/graph.cpp @@ -1092,7 +1092,7 @@ int ShaderGraph::get_num_closures() num_closures += VOLUME_STACK_SIZE; } else if(closure_type == CLOSURE_BSDF_HAIR_PRINCIPLED_ID) { - num_closures += 5; + num_closures += 4; } else { ++num_closures; diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp index 6358a463210..96e7459a48c 100644 --- a/intern/cycles/render/nodes.cpp +++ b/intern/cycles/render/nodes.cpp @@ -3122,11 +3122,6 @@ NODE_DEFINE(PrincipledHairBsdfNode) SOCKET_IN_FLOAT(random_color, "Random Color", 0.0f); SOCKET_IN_FLOAT(random, "Random", 0.0f); - SOCKET_IN_FLOAT(primary_specular, "Primary Specular", 1.0f); - SOCKET_IN_FLOAT(transmission, "Transmission", 1.0f); - SOCKET_IN_FLOAT(secondary_specular, "Secondary Specular", 1.0f); - SOCKET_IN_FLOAT(residual, "Residual", 1.0f); - SOCKET_IN_NORMAL(normal, "Normal", make_float3(0.0f, 0.0f, 0.0f), SocketType::LINK_NORMAL); SOCKET_IN_FLOAT(surface_mix_weight, "SurfaceMixWeight", 0.0f, SocketType::SVM_INTERNAL); @@ -3172,11 +3167,6 @@ void PrincipledHairBsdfNode::compile(SVMCompiler& compiler) ShaderInput *random_in = input("Random"); int attr_random = random_in->link ? SVM_STACK_INVALID : compiler.attribute(ATTR_STD_CURVE_RANDOM); - ShaderInput *primary_specular_in = input("Primary Specular"); - ShaderInput *transmission_in = input("Transmission"); - ShaderInput *secondary_specular_in = input("Secondary Specular"); - ShaderInput *residual_in = input("Residual"); - /* Encode all parameters into data nodes. */ compiler.add_node(NODE_CLOSURE_BSDF, /* Socket IDs can be packed 4 at a time into a single data packet */ @@ -3219,22 +3209,12 @@ void PrincipledHairBsdfNode::compile(SVMCompiler& compiler) compiler.add_node( compiler.encode_uchar4( - compiler.stack_assign_if_linked(primary_specular_in), - compiler.stack_assign_if_linked(transmission_in), - compiler.stack_assign_if_linked(secondary_specular_in), - compiler.stack_assign_if_linked(residual_in)), - attr_random, - __float_as_uint(primary_specular), - __float_as_uint(transmission)); - - compiler.add_node( - compiler.encode_uchar4( SVM_STACK_INVALID, SVM_STACK_INVALID, SVM_STACK_INVALID, SVM_STACK_INVALID), - __float_as_uint(secondary_specular), - __float_as_uint(residual), + attr_random, + SVM_STACK_INVALID, SVM_STACK_INVALID); } diff --git a/intern/cycles/render/nodes.h b/intern/cycles/render/nodes.h index 5b277ed0bb1..28bbe2de05a 100644 --- a/intern/cycles/render/nodes.h +++ b/intern/cycles/render/nodes.h @@ -639,11 +639,6 @@ public: /* Absorption coefficient (unfiltered). */ float3 absorption_coefficient; - float primary_specular; - float transmission; - float secondary_specular; - float residual; - float3 normal; float surface_mix_weight; /* If linked, here will be the given random number. */ |