Code cleanup: simplify SVM stack assignment.

2 files changed, 9 insertions, 7 deletions

diff --git a/intern/cycles/kernel/svm/svm.h b/intern/cycles/kernel/svm/svm.h
index 9865da2e8cd..543e31bcb35 100644
--- a/intern/cycles/kernel/svm/svm.h
+++ b/intern/cycles/kernel/svm/svm.h
@@ -295,7 +295,7 @@ ccl_device_noinline void svm_eval_nodes(KernelGlobals *kg, ShaderData *sd, ccl_a
 				break;
 #    endif  /* NODES_FEATURE(NODE_FEATURE_BUMP) */
 			case NODE_HSV:
-				svm_node_hsv(kg, sd, stack, node.y, node.z, node.w, &offset);
+				svm_node_hsv(kg, sd, stack, node, &offset);
 				break;
 #  endif  /* __EXTRA_NODES__ */
 #endif  /* NODES_GROUP(NODE_GROUP_LEVEL_0) */
diff --git a/intern/cycles/kernel/svm/svm_hsv.h b/intern/cycles/kernel/svm/svm_hsv.h
index 1f2cad60df7..3a1840c12e2 100644
--- a/intern/cycles/kernel/svm/svm_hsv.h
+++ b/intern/cycles/kernel/svm/svm_hsv.h
@@ -19,18 +19,20 @@
 
 CCL_NAMESPACE_BEGIN
 
-ccl_device void svm_node_hsv(KernelGlobals *kg, ShaderData *sd, float *stack, uint in_color_offset, uint fac_offset, uint out_color_offset, int *offset)
+ccl_device void svm_node_hsv(KernelGlobals *kg, ShaderData *sd, float *stack, uint4 node, int *offset)
 {
-	/* read extra data */
-	uint4 node1 = read_node(kg, offset);
+	uint in_color_offset, fac_offset, out_color_offset;
+	uint hue_offset, sat_offset, val_offset;
+	decode_node_uchar4(node.y, &in_color_offset, &fac_offset, &out_color_offset, NULL);
+	decode_node_uchar4(node.z, &hue_offset, &sat_offset, &val_offset, NULL);
 
 	float fac = stack_load_float(stack, fac_offset);
 	float3 in_color = stack_load_float3(stack, in_color_offset);
 	float3 color = in_color;
 
-	float hue = stack_load_float(stack, node1.y);
-	float sat = stack_load_float(stack, node1.z);
-	float val = stack_load_float(stack, node1.w);
+	float hue = stack_load_float(stack, hue_offset);
+	float sat = stack_load_float(stack, sat_offset);
+	float val = stack_load_float(stack, val_offset);
 
 	color = rgb_to_hsv(color);