Merge branch 'glsl2-head' into glsl2

This brings in the standalone GLSL compiler that we are planning on
replacing the existing Mesa GLSL compiler.  It currently targets GLSL
1.20 and the Mesa IR.

1 files changed, 127 insertions, 0 deletions

diff --git a/src/glsl/builtins/130/max b/src/glsl/builtins/130/max
new file mode 100644
index 00000000000..45a6089c9f2
--- /dev/null
+++ b/src/glsl/builtins/130/max
@@ -0,0 +1,127 @@
+((function max
+   (signature int
+     (parameters
+       (declare (in) int arg0)
+       (declare (in) int arg1))
+     ((return (expression int max (var_ref arg0) (var_ref arg1)))))
+
+   (signature ivec2
+     (parameters
+       (declare (in) ivec2 arg0)
+       (declare (in) ivec2 arg1))
+     ((return (expression ivec2 max (var_ref arg0) (var_ref arg1)))))
+
+   (signature ivec3
+     (parameters
+       (declare (in) ivec3 arg0)
+       (declare (in) ivec3 arg1))
+     ((return (expression ivec3 max (var_ref arg0) (var_ref arg1)))))
+
+   (signature ivec4
+     (parameters
+       (declare (in) ivec4 arg0)
+       (declare (in) ivec4 arg1))
+     ((return (expression ivec4 max (var_ref arg0) (var_ref arg1)))))
+
+   (signature ivec2
+     (parameters
+       (declare (in) ivec2  arg0)
+       (declare (in) int arg1))
+     ((declare () ivec2 result)
+      (assign (constant bool (1)) (swiz x (var_ref result))
+              (expression int max (swiz x (var_ref arg0)) (var_ref arg1)))
+      (assign (constant bool (1)) (swiz y (var_ref result))
+              (expression int max (swiz y (var_ref arg0)) (var_ref arg1)))
+      (return (var_ref result))))
+
+   (signature ivec3
+     (parameters
+       (declare (in) ivec3  arg0)
+       (declare (in) int arg1))
+     ((declare () ivec3 result)
+      (assign (constant bool (1)) (swiz x (var_ref result))
+              (expression int max (swiz x (var_ref arg0)) (var_ref arg1)))
+      (assign (constant bool (1)) (swiz y (var_ref result))
+              (expression int max (swiz y (var_ref arg0)) (var_ref arg1)))
+      (assign (constant bool (1)) (swiz z (var_ref result))
+              (expression int max (swiz z (var_ref arg0)) (var_ref arg1)))
+      (return (var_ref result))))
+
+   (signature ivec4
+     (parameters
+       (declare (in) ivec4  arg0)
+       (declare (in) int arg1))
+     ((declare () ivec4 result)
+      (assign (constant bool (1)) (swiz x (var_ref result))
+              (expression int max (swiz x (var_ref arg0)) (var_ref arg1)))
+      (assign (constant bool (1)) (swiz y (var_ref result))
+              (expression int max (swiz y (var_ref arg0)) (var_ref arg1)))
+      (assign (constant bool (1)) (swiz z (var_ref result))
+              (expression int max (swiz z (var_ref arg0)) (var_ref arg1)))
+      (assign (constant bool (1)) (swiz w (var_ref result))
+              (expression int max (swiz w (var_ref arg0)) (var_ref arg1)))
+      (return (var_ref result))))
+
+   (signature uint
+     (parameters
+       (declare (in) uint arg0)
+       (declare (in) uint arg1))
+     ((return (expression uint max (var_ref arg0) (var_ref arg1)))))
+
+   (signature uvec2
+     (parameters
+       (declare (in) uvec2 arg0)
+       (declare (in) uvec2 arg1))
+     ((return (expression uvec2 max (var_ref arg0) (var_ref arg1)))))
+
+   (signature uvec3
+     (parameters
+       (declare (in) uvec3 arg0)
+       (declare (in) uvec3 arg1))
+     ((return (expression uvec3 max (var_ref arg0) (var_ref arg1)))))
+
+   (signature uvec4
+     (parameters
+       (declare (in) uvec4 arg0)
+       (declare (in) uvec4 arg1))
+     ((return (expression uvec4 max (var_ref arg0) (var_ref arg1)))))
+
+   (signature uvec2
+     (parameters
+       (declare (in) uvec2  arg0)
+       (declare (in) uint arg1))
+     ((declare () uvec2 result)
+      (assign (constant bool (1)) (swiz x (var_ref result))
+              (expression uint max (swiz x (var_ref arg0)) (var_ref arg1)))
+      (assign (constant bool (1)) (swiz y (var_ref result))
+              (expression uint max (swiz y (var_ref arg0)) (var_ref arg1)))
+      (return (var_ref result))))
+
+   (signature uvec3
+     (parameters
+       (declare (in) uvec3  arg0)
+       (declare (in) uint arg1))
+     ((declare () uvec3 result)
+      (assign (constant bool (1)) (swiz x (var_ref result))
+              (expression uint max (swiz x (var_ref arg0)) (var_ref arg1)))
+      (assign (constant bool (1)) (swiz y (var_ref result))
+              (expression uint max (swiz y (var_ref arg0)) (var_ref arg1)))
+      (assign (constant bool (1)) (swiz z (var_ref result))
+              (expression uint max (swiz z (var_ref arg0)) (var_ref arg1)))
+      (return (var_ref result))))
+
+   (signature uvec4
+     (parameters
+       (declare (in) uvec4  arg0)
+       (declare (in) uint arg1))
+     ((declare () uvec4 result)
+      (assign (constant bool (1)) (swiz x (var_ref result))
+              (expression uint max (swiz x (var_ref arg0)) (var_ref arg1)))
+      (assign (constant bool (1)) (swiz y (var_ref result))
+              (expression uint max (swiz y (var_ref arg0)) (var_ref arg1)))
+      (assign (constant bool (1)) (swiz z (var_ref result))
+              (expression uint max (swiz z (var_ref arg0)) (var_ref arg1)))
+      (assign (constant bool (1)) (swiz w (var_ref result))
+              (expression uint max (swiz w (var_ref arg0)) (var_ref arg1)))
+      (return (var_ref result))))
+))