Merge branch 'glsl2'

Conflicts:
	src/mesa/program/prog_optimize.c

1 files changed, 42 insertions, 0 deletions

diff --git a/src/glsl/builtins/ir/sign b/src/glsl/builtins/ir/sign
new file mode 100644
index 0000000000..1f51718dab
--- /dev/null
+++ b/src/glsl/builtins/ir/sign
@@ -0,0 +1,42 @@
+((function sign
+   (signature float
+     (parameters
+       (declare (in) float x))
+     ((return (expression float sign (var_ref x)))))
+
+   (signature vec2
+     (parameters
+       (declare (in) vec2 x))
+     ((return (expression vec2 sign (var_ref x)))))
+
+   (signature vec3
+     (parameters
+       (declare (in) vec3 x))
+     ((return (expression vec3 sign (var_ref x)))))
+
+   (signature vec4
+     (parameters
+       (declare (in) vec4 x))
+     ((return (expression vec4 sign (var_ref x)))))
+
+   (signature int
+     (parameters
+       (declare (in) int x))
+     ((return (expression int sign (var_ref x)))))
+
+   (signature ivec2
+     (parameters
+       (declare (in) ivec2 x))
+     ((return (expression ivec2 sign (var_ref x)))))
+
+   (signature ivec3
+     (parameters
+       (declare (in) ivec3 x))
+     ((return (expression ivec3 sign (var_ref x)))))
+
+   (signature ivec4
+     (parameters
+       (declare (in) ivec4 x))
+     ((return (expression ivec4 sign (var_ref x)))))
+))
+