Invert Color Cycles Node

as with the HSV node the OSL code is relying on the (yet to be implemented) autorename.

Also the svm code could use mix (svm_lerp) instead:
 32 . float3 color_inv = make_float3(1.0f, 1.0f, 1.0f) - color;
 35 . . stack_store_float3(stack, out_color, svm_lerp(color_inv, color, factor));

I have a feeling that each node 'program' should have the least program as possible. I'll see with Brecht later.
But overall I don't know if that's any fast. And apart from that I think we will need this kind of function to move to a library if multiple functions linked in are not a problem.

6 files changed, 77 insertions, 1 deletions

diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt
index 59f7e04c9d8..601b95d262a 100644
--- a/intern/cycles/kernel/CMakeLists.txt
+++ b/intern/cycles/kernel/CMakeLists.txt
@@ -63,6 +63,7 @@ set(SRC_SVM_HEADERS
 	svm/svm_gradient.h
 	svm/svm_hsv.h
 	svm/svm_image.h
+	svm/svm_invert.h
 	svm/svm_light_path.h
 	svm/svm_magic.h
 	svm/svm_mapping.h
diff --git a/intern/cycles/kernel/osl/nodes/CMakeLists.txt b/intern/cycles/kernel/osl/nodes/CMakeLists.txt
index 02f4a5a55bf..433fc2155fe 100644
--- a/intern/cycles/kernel/osl/nodes/CMakeLists.txt
+++ b/intern/cycles/kernel/osl/nodes/CMakeLists.txt
@@ -24,6 +24,7 @@ set(SRC_OSL
 	node_glossy_bsdf.osl
 	node_hsv.osl
 	node_image_texture.osl
+	node_invert.osl
 	node_light_path.osl
 	node_magic_texture.osl
 	node_mapping.osl
diff --git a/intern/cycles/kernel/osl/nodes/node_invert.osl b/intern/cycles/kernel/osl/nodes/node_invert.osl
new file mode 100644
index 00000000000..817198c4561
--- /dev/null
+++ b/intern/cycles/kernel/osl/nodes/node_invert.osl
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2011, Blender Foundation.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#include "stdosl.h"
+
+shader node_invert(
+	float Fac = 1.0,
+	color ColorIn = color(0.8, 0.8, 0.8),
+	output ColorOut = color(0.8, 0.8, 0.8)
+{
+	color ColorInv = color(1.0) - ColorIn;
+	ColorOut = mix(ColorIn, ColorInv, Fac);
+}
+
diff --git a/intern/cycles/kernel/svm/svm.h b/intern/cycles/kernel/svm/svm.h
index 443715600ca..5fde44e2769 100644
--- a/intern/cycles/kernel/svm/svm.h
+++ b/intern/cycles/kernel/svm/svm.h
@@ -130,6 +130,7 @@ CCL_NAMESPACE_END
 #include "svm_geometry.h"
 #include "svm_hsv.h"
 #include "svm_image.h"
+#include "svm_invert.h"
 #include "svm_light_path.h"
 #include "svm_magic.h"
 #include "svm_mapping.h"
@@ -257,6 +258,9 @@ __device_noinline void svm_eval_nodes(KernelGlobals *kg, ShaderData *sd, ShaderT
 			case NODE_VALUE_V:
 				svm_node_value_v(kg, sd, stack, node.y, &offset);
 				break;
+			case NODE_INVERT:
+				svm_node_invert(sd, stack, node.y, node.z, node.w);
+				break;
 			case NODE_MIX:
 				svm_node_mix(kg, sd, stack, node.y, node.z, node.w, &offset);
 				break;
diff --git a/intern/cycles/kernel/svm/svm_invert.h b/intern/cycles/kernel/svm/svm_invert.h
new file mode 100644
index 00000000000..a14d8ec82fa
--- /dev/null
+++ b/intern/cycles/kernel/svm/svm_invert.h
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2011, Blender Foundation.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+CCL_NAMESPACE_BEGIN
+
+__device float invert(float color, float factor)
+{
+	return factor*(1.0f - color) + (1.0f - factor) * color;
+}
+
+__device void svm_node_invert(ShaderData *sd, float *stack, uint in_fac, uint in_color, uint out_color)
+{
+	float factor = stack_load_float(stack, in_fac);
+	float3 color = stack_load_float3(stack, in_color);
+
+	color.x = invert(color.x, factor);
+	color.y = invert(color.y, factor);
+	color.z = invert(color.z, factor);
+
+	if (stack_valid(out_color))
+		stack_store_float3(stack, out_color, color);
+}
+
+CCL_NAMESPACE_END
+
diff --git a/intern/cycles/kernel/svm/svm_types.h b/intern/cycles/kernel/svm/svm_types.h
index fcd345b9359..efec5c7650d 100644
--- a/intern/cycles/kernel/svm/svm_types.h
+++ b/intern/cycles/kernel/svm/svm_types.h
@@ -83,7 +83,8 @@ typedef enum NodeType {
 	NODE_SEPARATE_RGB = 5000,
 	NODE_COMBINE_RGB = 5100,
 	NODE_HSV = 5200,
-	NODE_CAMERA = 5300
+	NODE_CAMERA = 5300,
+	NODE_INVERT = 5400
 } NodeType;
 
 typedef enum NodeAttributeType {