glsl2: Rework builtin function generation.

Each language version/extension and target now has a "profile" containing
all of the available builtin function prototypes.  These are written in
GLSL, and come directly out of the GLSL spec (except for expanding genType).

A new builtins/ir/ folder contains the hand-written IR for each builtin,
regardless of what version includes it.  Only those definitions that have
prototypes in the profile will be included.

The autogenerated IR for texture builtins is no longer written to disk,
so there's no longer any confusion as to what's hand-written or
generated.

All scripts are now in python instead of perl.

21 files changed, 0 insertions, 1431 deletions

diff --git a/src/glsl/builtins/130/clamp b/src/glsl/builtins/130/clamp
deleted file mode 100644
index e1aad5c8d9..0000000000
--- a/src/glsl/builtins/130/clamp
+++ /dev/null
@@ -1,99 +0,0 @@
-((function clamp
-   (signature int
-     (parameters
-       (declare (in) int arg0)
-       (declare (in) int arg1)
-       (declare (in) int arg2))
-     ((return (expression int max (expression int min (var_ref arg0) (var_ref arg2)) (var_ref arg1)))))
-
-   (signature ivec2
-     (parameters
-       (declare (in) ivec2 arg0)
-       (declare (in) ivec2 arg1)
-       (declare (in) ivec2 arg2))
-     ((return (expression ivec2 max (expression ivec2 min (var_ref arg0) (var_ref arg2)) (var_ref arg1)))))
-
-   (signature ivec3
-     (parameters
-       (declare (in) ivec3 arg0)
-       (declare (in) ivec3 arg1)
-       (declare (in) ivec3 arg2))
-     ((return (expression ivec3 max (expression ivec3 min (var_ref arg0) (var_ref arg2)) (var_ref arg1)))))
-
-   (signature ivec4
-     (parameters
-       (declare (in) ivec4 arg0)
-       (declare (in) ivec4 arg1)
-       (declare (in) ivec4 arg2))
-     ((return (expression ivec4 max (expression ivec4 min (var_ref arg0) (var_ref arg2)) (var_ref arg1)))))
-
-   (signature ivec2
-     (parameters
-       (declare (in) ivec2 arg0)
-       (declare (in) int arg1)
-       (declare (in) int arg2))
-     ((return (expression ivec2 max (expression ivec2 min (var_ref arg0) (var_ref arg2)) (var_ref arg1)))))
-
-   (signature ivec3
-     (parameters
-       (declare (in) ivec3 arg0)
-       (declare (in) int arg1)
-       (declare (in) int arg2))
-     ((return (expression ivec3 max (expression ivec3 min (var_ref arg0) (var_ref arg2)) (var_ref arg1)))))
-
-   (signature ivec4
-     (parameters
-       (declare (in) ivec4 arg0)
-       (declare (in) int arg1)
-       (declare (in) int arg2))
-     ((return (expression ivec4 max (expression ivec4 min (var_ref arg0) (var_ref arg2)) (var_ref arg1)))))
-
-   (signature uint
-     (parameters
-       (declare (in) uint arg0)
-       (declare (in) uint arg1)
-       (declare (in) uint arg2))
-     ((return (expression uint max (expression uint min (var_ref arg0) (var_ref arg2)) (var_ref arg1)))))
-
-   (signature uvec2
-     (parameters
-       (declare (in) uvec2 arg0)
-       (declare (in) uvec2 arg1)
-       (declare (in) uvec2 arg2))
-     ((return (expression uvec2 max (expression uvec2 min (var_ref arg0) (var_ref arg2)) (var_ref arg1)))))
-
-   (signature uvec3
-     (parameters
-       (declare (in) uvec3 arg0)
-       (declare (in) uvec3 arg1)
-       (declare (in) uvec3 arg2))
-     ((return (expression uvec3 max (expression uvec3 min (var_ref arg0) (var_ref arg2)) (var_ref arg1)))))
-
-   (signature uvec4
-     (parameters
-       (declare (in) uvec4 arg0)
-       (declare (in) uvec4 arg1)
-       (declare (in) uvec4 arg2))
-     ((return (expression uvec4 max (expression uvec4 min (var_ref arg0) (var_ref arg2)) (var_ref arg1)))))
-
-   (signature uvec2
-     (parameters
-       (declare (in) uvec2 arg0)
-       (declare (in) uint arg1)
-       (declare (in) uint arg2))
-     ((return (expression uvec2 max (expression uvec2 min (var_ref arg0) (var_ref arg2)) (var_ref arg1)))))
-
-   (signature uvec3
-     (parameters
-       (declare (in) uvec3 arg0)
-       (declare (in) uint arg1)
-       (declare (in) uint arg2))
-     ((return (expression uvec3 max (expression uvec3 min (var_ref arg0) (var_ref arg2)) (var_ref arg1)))))
-
-   (signature uvec4
-     (parameters
-       (declare (in) uvec4 arg0)
-       (declare (in) uint arg1)
-       (declare (in) uint arg2))
-     ((return (expression uvec4 max (expression uvec4 min (var_ref arg0) (var_ref arg2)) (var_ref arg1)))))
-))
diff --git a/src/glsl/builtins/130/cosh b/src/glsl/builtins/130/cosh
deleted file mode 100644
index 45e0ae427d..0000000000
--- a/src/glsl/builtins/130/cosh
+++ /dev/null
@@ -1,30 +0,0 @@
-((function cosh
-   (signature float
-     (parameters
-       (declare (in) float x))
-     ((return (expression float * (constant float (0.5))
-                (expression float +
-		  (expression float exp (var_ref x))
-		  (expression float exp (expression float neg (var_ref x))))))))
-   (signature vec2
-     (parameters
-       (declare (in) vec2 x))
-     ((return (expression vec2 * (constant vec2 (0.5))
-                (expression vec2 +
-		  (expression vec2 exp (var_ref x))
-		  (expression vec2 exp (expression vec2 neg (var_ref x))))))))
-   (signature vec3
-     (parameters
-       (declare (in) vec3 x))
-     ((return (expression vec3 * (constant vec3 (0.5))
-                (expression vec3 +
-		  (expression vec3 exp (var_ref x))
-		  (expression vec3 exp (expression vec3 neg (var_ref x))))))))
-   (signature vec4
-     (parameters
-       (declare (in) vec4 x))
-     ((return (expression vec4 * (constant vec4 (0.5))
-                (expression vec4 +
-		  (expression vec4 exp (var_ref x))
-		  (expression vec4 exp (expression vec4 neg (var_ref x))))))))
-))
diff --git a/src/glsl/builtins/130/equal b/src/glsl/builtins/130/equal
deleted file mode 100644
index 079c3e97fb..0000000000
--- a/src/glsl/builtins/130/equal
+++ /dev/null
@@ -1,31 +0,0 @@
-((function equal
-   (signature bvec2
-     (parameters
-       (declare (in) uvec2 arg0)
-       (declare (in) uvec2 arg1))
-     ((declare () bvec2 temp)
-      (assign (constant bool (1)) (swiz x (var_ref temp)) (expression bool == (swiz x (var_ref arg0))(swiz x (var_ref arg1)))) 
-      (assign (constant bool (1)) (swiz y (var_ref temp)) (expression bool == (swiz y (var_ref arg0))(swiz y (var_ref arg1)))) 
-      (return (var_ref temp))))
-
-   (signature bvec3
-     (parameters
-       (declare (in) uvec3 arg0)
-       (declare (in) uvec3 arg1))
-     ((declare () bvec3 temp)
-      (assign (constant bool (1)) (swiz x (var_ref temp)) (expression bool == (swiz x (var_ref arg0))(swiz x (var_ref arg1)))) 
-      (assign (constant bool (1)) (swiz y (var_ref temp)) (expression bool == (swiz y (var_ref arg0))(swiz y (var_ref arg1)))) 
-      (assign (constant bool (1)) (swiz z (var_ref temp)) (expression bool == (swiz z (var_ref arg0))(swiz z (var_ref arg1)))) 
-      (return (var_ref temp))))
-
-   (signature bvec4
-     (parameters
-       (declare (in) uvec4 arg0)
-       (declare (in) uvec4 arg1))
-     ((declare () bvec4 temp)
-      (assign (constant bool (1)) (swiz x (var_ref temp)) (expression bool == (swiz x (var_ref arg0))(swiz x (var_ref arg1)))) 
-      (assign (constant bool (1)) (swiz y (var_ref temp)) (expression bool == (swiz y (var_ref arg0))(swiz y (var_ref arg1)))) 
-      (assign (constant bool (1)) (swiz z (var_ref temp)) (expression bool == (swiz z (var_ref arg0))(swiz z (var_ref arg1)))) 
-      (assign (constant bool (1)) (swiz w (var_ref temp)) (expression bool == (swiz w (var_ref arg0))(swiz w (var_ref arg1)))) 
-      (return (var_ref temp))))
-))
diff --git a/src/glsl/builtins/130/greaterThan b/src/glsl/builtins/130/greaterThan
deleted file mode 100644
index a9fb7b3a43..0000000000
--- a/src/glsl/builtins/130/greaterThan
+++ /dev/null
@@ -1,31 +0,0 @@
-((function greaterThan
-   (signature bvec2
-     (parameters
-       (declare (in) uvec2 arg0)
-       (declare (in) uvec2 arg1))
-     ((declare () bvec2 temp)
-      (assign (constant bool (1)) (swiz x (var_ref temp)) (expression bool > (swiz x (var_ref arg0))(swiz x (var_ref arg1)))) 
-      (assign (constant bool (1)) (swiz y (var_ref temp)) (expression bool > (swiz y (var_ref arg0))(swiz y (var_ref arg1)))) 
-      (return (var_ref temp))))
-
-   (signature bvec3
-     (parameters
-       (declare (in) uvec3 arg0)
-       (declare (in) uvec3 arg1))
-     ((declare () bvec3 temp)
-      (assign (constant bool (1)) (swiz x (var_ref temp)) (expression bool > (swiz x (var_ref arg0))(swiz x (var_ref arg1)))) 
-      (assign (constant bool (1)) (swiz y (var_ref temp)) (expression bool > (swiz y (var_ref arg0))(swiz y (var_ref arg1)))) 
-      (assign (constant bool (1)) (swiz z (var_ref temp)) (expression bool > (swiz z (var_ref arg0))(swiz z (var_ref arg1)))) 
-      (return (var_ref temp))))
-
-   (signature bvec4
-     (parameters
-       (declare (in) uvec4 arg0)
-       (declare (in) uvec4 arg1))
-     ((declare () bvec4 temp)
-      (assign (constant bool (1)) (swiz x (var_ref temp)) (expression bool > (swiz x (var_ref arg0))(swiz x (var_ref arg1)))) 
-      (assign (constant bool (1)) (swiz y (var_ref temp)) (expression bool > (swiz y (var_ref arg0))(swiz y (var_ref arg1)))) 
-      (assign (constant bool (1)) (swiz z (var_ref temp)) (expression bool > (swiz z (var_ref arg0))(swiz z (var_ref arg1)))) 
-      (assign (constant bool (1)) (swiz w (var_ref temp)) (expression bool > (swiz w (var_ref arg0))(swiz w (var_ref arg1)))) 
-      (return (var_ref temp))))
-))
diff --git a/src/glsl/builtins/130/greaterThanEqual b/src/glsl/builtins/130/greaterThanEqual
deleted file mode 100644
index 293c93c7cc..0000000000
--- a/src/glsl/builtins/130/greaterThanEqual
+++ /dev/null
@@ -1,31 +0,0 @@
-((function greaterThanEqual
-   (signature bvec2
-     (parameters
-       (declare (in) uvec2 arg0)
-       (declare (in) uvec2 arg1))
-     ((declare () bvec2 temp)
-      (assign (constant bool (1)) (swiz x (var_ref temp)) (expression bool >= (swiz x (var_ref arg0))(swiz x (var_ref arg1)))) 
-      (assign (constant bool (1)) (swiz y (var_ref temp)) (expression bool >= (swiz y (var_ref arg0))(swiz y (var_ref arg1)))) 
-      (return (var_ref temp))))
-
-   (signature bvec3
-     (parameters
-       (declare (in) uvec3 arg0)
-       (declare (in) uvec3 arg1))
-     ((declare () bvec3 temp)
-      (assign (constant bool (1)) (swiz x (var_ref temp)) (expression bool >= (swiz x (var_ref arg0))(swiz x (var_ref arg1)))) 
-      (assign (constant bool (1)) (swiz y (var_ref temp)) (expression bool >= (swiz y (var_ref arg0))(swiz y (var_ref arg1)))) 
-      (assign (constant bool (1)) (swiz z (var_ref temp)) (expression bool >= (swiz z (var_ref arg0))(swiz z (var_ref arg1)))) 
-      (return (var_ref temp))))
-
-   (signature bvec4
-     (parameters
-       (declare (in) uvec4 arg0)
-       (declare (in) uvec4 arg1))
-     ((declare () bvec4 temp)
-      (assign (constant bool (1)) (swiz x (var_ref temp)) (expression bool >= (swiz x (var_ref arg0))(swiz x (var_ref arg1)))) 
-      (assign (constant bool (1)) (swiz y (var_ref temp)) (expression bool >= (swiz y (var_ref arg0))(swiz y (var_ref arg1)))) 
-      (assign (constant bool (1)) (swiz z (var_ref temp)) (expression bool >= (swiz z (var_ref arg0))(swiz z (var_ref arg1)))) 
-      (assign (constant bool (1)) (swiz w (var_ref temp)) (expression bool >= (swiz w (var_ref arg0))(swiz w (var_ref arg1)))) 
-      (return (var_ref temp))))
-))
diff --git a/src/glsl/builtins/130/lessThan b/src/glsl/builtins/130/lessThan
deleted file mode 100644
index d9f693fd63..0000000000
--- a/src/glsl/builtins/130/lessThan
+++ /dev/null
@@ -1,31 +0,0 @@
-((function lessThan
-   (signature bvec2
-     (parameters
-       (declare (in) uvec2 arg0)
-       (declare (in) uvec2 arg1))
-     ((declare () bvec2 temp)
-      (assign (constant bool (1)) (swiz x (var_ref temp)) (expression bool < (swiz x (var_ref arg0))(swiz x (var_ref arg1)))) 
-      (assign (constant bool (1)) (swiz y (var_ref temp)) (expression bool < (swiz y (var_ref arg0))(swiz y (var_ref arg1)))) 
-      (return (var_ref temp))))
-
-   (signature bvec3
-     (parameters
-       (declare (in) uvec3 arg0)
-       (declare (in) uvec3 arg1))
-     ((declare () bvec3 temp)
-      (assign (constant bool (1)) (swiz x (var_ref temp)) (expression bool < (swiz x (var_ref arg0))(swiz x (var_ref arg1)))) 
-      (assign (constant bool (1)) (swiz y (var_ref temp)) (expression bool < (swiz y (var_ref arg0))(swiz y (var_ref arg1)))) 
-      (assign (constant bool (1)) (swiz z (var_ref temp)) (expression bool < (swiz z (var_ref arg0))(swiz z (var_ref arg1)))) 
-      (return (var_ref temp))))
-
-   (signature bvec4
-     (parameters
-       (declare (in) uvec4 arg0)
-       (declare (in) uvec4 arg1))
-     ((declare () bvec4 temp)
-      (assign (constant bool (1)) (swiz x (var_ref temp)) (expression bool < (swiz x (var_ref arg0))(swiz x (var_ref arg1)))) 
-      (assign (constant bool (1)) (swiz y (var_ref temp)) (expression bool < (swiz y (var_ref arg0))(swiz y (var_ref arg1)))) 
-      (assign (constant bool (1)) (swiz z (var_ref temp)) (expression bool < (swiz z (var_ref arg0))(swiz z (var_ref arg1)))) 
-      (assign (constant bool (1)) (swiz w (var_ref temp)) (expression bool < (swiz w (var_ref arg0))(swiz w (var_ref arg1)))) 
-      (return (var_ref temp))))
-))
diff --git a/src/glsl/builtins/130/lessThanEqual b/src/glsl/builtins/130/lessThanEqual
deleted file mode 100644
index 494411b869..0000000000
--- a/src/glsl/builtins/130/lessThanEqual
+++ /dev/null
@@ -1,31 +0,0 @@
-((function lessThanEqual
-   (signature bvec2
-     (parameters
-       (declare (in) uvec2 arg0)
-       (declare (in) uvec2 arg1))
-     ((declare () bvec2 temp)
-      (assign (constant bool (1)) (swiz x (var_ref temp)) (expression bool <= (swiz x (var_ref arg0))(swiz x (var_ref arg1)))) 
-      (assign (constant bool (1)) (swiz y (var_ref temp)) (expression bool <= (swiz y (var_ref arg0))(swiz y (var_ref arg1)))) 
-      (return (var_ref temp))))
-
-   (signature bvec3
-     (parameters
-       (declare (in) uvec3 arg0)
-       (declare (in) uvec3 arg1))
-     ((declare () bvec3 temp)
-      (assign (constant bool (1)) (swiz x (var_ref temp)) (expression bool <= (swiz x (var_ref arg0))(swiz x (var_ref arg1)))) 
-      (assign (constant bool (1)) (swiz y (var_ref temp)) (expression bool <= (swiz y (var_ref arg0))(swiz y (var_ref arg1)))) 
-      (assign (constant bool (1)) (swiz z (var_ref temp)) (expression bool <= (swiz z (var_ref arg0))(swiz z (var_ref arg1)))) 
-      (return (var_ref temp))))
-
-   (signature bvec4
-     (parameters
-       (declare (in) uvec4 arg0)
-       (declare (in) uvec4 arg1))
-     ((declare () bvec4 temp)
-      (assign (constant bool (1)) (swiz x (var_ref temp)) (expression bool <= (swiz x (var_ref arg0))(swiz x (var_ref arg1)))) 
-      (assign (constant bool (1)) (swiz y (var_ref temp)) (expression bool <= (swiz y (var_ref arg0))(swiz y (var_ref arg1)))) 
-      (assign (constant bool (1)) (swiz z (var_ref temp)) (expression bool <= (swiz z (var_ref arg0))(swiz z (var_ref arg1)))) 
-      (assign (constant bool (1)) (swiz w (var_ref temp)) (expression bool <= (swiz w (var_ref arg0))(swiz w (var_ref arg1)))) 
-      (return (var_ref temp))))
-))
diff --git a/src/glsl/builtins/130/max b/src/glsl/builtins/130/max
deleted file mode 100644
index 0863e411a3..0000000000
--- a/src/glsl/builtins/130/max
+++ /dev/null
@@ -1,85 +0,0 @@
-((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))
-     ((return (expression ivec2 max (var_ref arg0) (var_ref arg1)))))
-
-   (signature ivec3
-     (parameters
-       (declare (in) ivec3  arg0)
-       (declare (in) int arg1))
-     ((return (expression ivec3 max (var_ref arg0) (var_ref arg1)))))
-
-   (signature ivec4
-     (parameters
-       (declare (in) ivec4  arg0)
-       (declare (in) int arg1))
-     ((return (expression ivec4 max (var_ref arg0) (var_ref arg1)))))
-
-   (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))
-     ((return (expression uvec2 max (var_ref arg0) (var_ref arg1)))))
-
-   (signature uvec3
-     (parameters
-       (declare (in) uvec3  arg0)
-       (declare (in) uint arg1))
-     ((return (expression uvec3 max (var_ref arg0) (var_ref arg1)))))
-
-   (signature uvec4
-     (parameters
-       (declare (in) uvec4  arg0)
-       (declare (in) uint arg1))
-     ((return (expression uvec4 max (var_ref arg0) (var_ref arg1)))))
-))
diff --git a/src/glsl/builtins/130/min b/src/glsl/builtins/130/min
deleted file mode 100644
index 576546f6f2..0000000000
--- a/src/glsl/builtins/130/min
+++ /dev/null
@@ -1,85 +0,0 @@
-((function min
-   (signature int
-     (parameters
-       (declare (in) int arg0)
-       (declare (in) int arg1))
-     ((return (expression int min (var_ref arg0) (var_ref arg1)))))
-
-   (signature ivec2
-     (parameters
-       (declare (in) ivec2 arg0)
-       (declare (in) ivec2 arg1))
-     ((return (expression ivec2 min (var_ref arg0) (var_ref arg1)))))
-
-   (signature ivec3
-     (parameters
-       (declare (in) ivec3 arg0)
-       (declare (in) ivec3 arg1))
-     ((return (expression ivec3 min (var_ref arg0) (var_ref arg1)))))
-
-   (signature ivec4
-     (parameters
-       (declare (in) ivec4 arg0)
-       (declare (in) ivec4 arg1))
-     ((return (expression ivec4 min (var_ref arg0) (var_ref arg1)))))
-
-   (signature ivec2
-     (parameters
-       (declare (in) ivec2  arg0)
-       (declare (in) int arg1))
-     ((return (expression ivec2 min (var_ref arg0) (var_ref arg1)))))
-
-   (signature ivec3
-     (parameters
-       (declare (in) ivec3  arg0)
-       (declare (in) int arg1))
-     ((return (expression ivec3 min (var_ref arg0) (var_ref arg1)))))
-
-   (signature ivec4
-     (parameters
-       (declare (in) ivec4  arg0)
-       (declare (in) int arg1))
-     ((return (expression ivec4 min (var_ref arg0) (var_ref arg1)))))
-
-   (signature uint
-     (parameters
-       (declare (in) uint arg0)
-       (declare (in) uint arg1))
-     ((return (expression uint min (var_ref arg0) (var_ref arg1)))))
-
-   (signature uvec2
-     (parameters
-       (declare (in) uvec2 arg0)
-       (declare (in) uvec2 arg1))
-     ((return (expression uvec2 min (var_ref arg0) (var_ref arg1)))))
-
-   (signature uvec3
-     (parameters
-       (declare (in) uvec3 arg0)
-       (declare (in) uvec3 arg1))
-     ((return (expression uvec3 min (var_ref arg0) (var_ref arg1)))))
-
-   (signature uvec4
-     (parameters
-       (declare (in) uvec4 arg0)
-       (declare (in) uvec4 arg1))
-     ((return (expression uvec4 min (var_ref arg0) (var_ref arg1)))))
-
-   (signature uvec2
-     (parameters
-       (declare (in) uvec2  arg0)
-       (declare (in) uint arg1))
-     ((return (expression uvec2 min (var_ref arg0) (var_ref arg1)))))
-
-   (signature uvec3
-     (parameters
-       (declare (in) uvec3  arg0)
-       (declare (in) uint arg1))
-     ((return (expression uvec3 min (var_ref arg0) (var_ref arg1)))))
-
-   (signature uvec4
-     (parameters
-       (declare (in) uvec4  arg0)
-       (declare (in) uint arg1))
-     ((return (expression uvec4 min (var_ref arg0) (var_ref arg1)))))
-))
diff --git a/src/glsl/builtins/130/mix b/src/glsl/builtins/130/mix
deleted file mode 100644
index 9a1fcd70ff..0000000000
--- a/src/glsl/builtins/130/mix
+++ /dev/null
@@ -1,39 +0,0 @@
-((function mix
-   (signature float
-     (parameters
-       (declare (in) float v1)
-       (declare (in) float v2)
-       (declare (in) bool  a))
-     ((assign (var_ref a) (var_ref v1) (var_ref v2))
-      (return (var_ref v1))))
-
-   (signature vec2
-     (parameters
-       (declare (in) vec2 v1)
-       (declare (in) vec2 v2)
-       (declare (in) bvec2 a))
-     ((assign (swiz x (var_ref a)) (swiz x (var_ref v1)) (swiz x (var_ref v2)))
-      (assign (swiz y (var_ref a)) (swiz y (var_ref v1)) (swiz y (var_ref v2)))
-      (return (var_ref v1))))
-
-   (signature vec3
-     (parameters
-       (declare (in) vec3 v1)
-       (declare (in) vec3 v2)
-       (declare (in) bvec3 a))
-     ((assign (swiz x (var_ref a)) (swiz x (var_ref v1)) (swiz x (var_ref v2)))
-      (assign (swiz y (var_ref a)) (swiz y (var_ref v1)) (swiz y (var_ref v2)))
-      (assign (swiz z (var_ref a)) (swiz z (var_ref v1)) (swiz z (var_ref v2)))
-      (return (var_ref v1))))
-
-   (signature vec4
-     (parameters
-       (declare (in) vec4 v1)
-       (declare (in) vec4 v2)
-       (declare (in) bvec4 a))
-     ((assign (swiz x (var_ref a)) (swiz x (var_ref v1)) (swiz x (var_ref v2)))
-      (assign (swiz y (var_ref a)) (swiz y (var_ref v1)) (swiz y (var_ref v2)))
-      (assign (swiz z (var_ref a)) (swiz z (var_ref v1)) (swiz z (var_ref v2)))
-      (assign (swiz w (var_ref a)) (swiz w (var_ref v1)) (swiz w (var_ref v2)))
-      (return (var_ref v1))))
-))
diff --git a/src/glsl/builtins/130/notEqual b/src/glsl/builtins/130/notEqual
deleted file mode 100644
index 81e6376bd9..0000000000
--- a/src/glsl/builtins/130/notEqual
+++ /dev/null
@@ -1,31 +0,0 @@
-((function notEqual
-   (signature bvec2
-     (parameters
-       (declare (in) uvec2 arg0)
-       (declare (in) uvec2 arg1))
-     ((declare () bvec2 temp)
-      (assign (constant bool (1)) (swiz x (var_ref temp)) (expression bool != (swiz x (var_ref arg0))(swiz x (var_ref arg1)))) 
-      (assign (constant bool (1)) (swiz y (var_ref temp)) (expression bool != (swiz y (var_ref arg0))(swiz y (var_ref arg1)))) 
-      (return (var_ref temp))))
-
-   (signature bvec3
-     (parameters
-       (declare (in) uvec3 arg0)
-       (declare (in) uvec3 arg1))
-     ((declare () bvec3 temp)
-      (assign (constant bool (1)) (swiz x (var_ref temp)) (expression bool != (swiz x (var_ref arg0))(swiz x (var_ref arg1)))) 
-      (assign (constant bool (1)) (swiz y (var_ref temp)) (expression bool != (swiz y (var_ref arg0))(swiz y (var_ref arg1)))) 
-      (assign (constant bool (1)) (swiz z (var_ref temp)) (expression bool != (swiz z (var_ref arg0))(swiz z (var_ref arg1)))) 
-      (return (var_ref temp))))
-
-   (signature bvec4
-     (parameters
-       (declare (in) uvec4 arg0)
-       (declare (in) uvec4 arg1))
-     ((declare () bvec4 temp)
-      (assign (constant bool (1)) (swiz x (var_ref temp)) (expression bool != (swiz x (var_ref arg0))(swiz x (var_ref arg1)))) 
-      (assign (constant bool (1)) (swiz y (var_ref temp)) (expression bool != (swiz y (var_ref arg0))(swiz y (var_ref arg1)))) 
-      (assign (constant bool (1)) (swiz z (var_ref temp)) (expression bool != (swiz z (var_ref arg0))(swiz z (var_ref arg1)))) 
-      (assign (constant bool (1)) (swiz w (var_ref temp)) (expression bool != (swiz w (var_ref arg0))(swiz w (var_ref arg1)))) 
-      (return (var_ref temp))))
-))
diff --git a/src/glsl/builtins/130/sign b/src/glsl/builtins/130/sign
deleted file mode 100644
index f86062a244..0000000000
--- a/src/glsl/builtins/130/sign
+++ /dev/null
@@ -1,22 +0,0 @@
-((function sign
-   (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)))))
-))
-
diff --git a/src/glsl/builtins/130/sinh b/src/glsl/builtins/130/sinh
deleted file mode 100644
index 7ad4f58e20..0000000000
--- a/src/glsl/builtins/130/sinh
+++ /dev/null
@@ -1,30 +0,0 @@
-((function sinh
-   (signature float
-     (parameters
-       (declare (in) float x))
-     ((return (expression float * (constant float (0.5))
-                (expression float -
-		  (expression float exp (var_ref x))
-		  (expression float exp (expression float neg (var_ref x))))))))
-   (signature vec2
-     (parameters
-       (declare (in) vec2 x))
-     ((return (expression vec2 * (constant vec2 (0.5))
-                (expression vec2 -
-		  (expression vec2 exp (var_ref x))
-		  (expression vec2 exp (expression vec2 neg (var_ref x))))))))
-   (signature vec3
-     (parameters
-       (declare (in) vec3 x))
-     ((return (expression vec3 * (constant vec3 (0.5))
-                (expression vec3 -
-		  (expression vec3 exp (var_ref x))
-		  (expression vec3 exp (expression vec3 neg (var_ref x))))))))
-   (signature vec4
-     (parameters
-       (declare (in) vec4 x))
-     ((return (expression vec4 * (constant vec4 (0.5))
-                (expression vec4 -
-		  (expression vec4 exp (var_ref x))
-		  (expression vec4 exp (expression vec4 neg (var_ref x))))))))
-))
diff --git a/src/glsl/builtins/130/tanh b/src/glsl/builtins/130/tanh
deleted file mode 100644
index 3b7271bf77..0000000000
--- a/src/glsl/builtins/130/tanh
+++ /dev/null
@@ -1,42 +0,0 @@
-((function tanh
-   (signature float
-     (parameters
-       (declare (in) float x))
-     ((return (expression float /
-                (expression float -
-		  (expression float exp (var_ref x))
-		  (expression float exp (expression float neg (var_ref x))))
-                (expression float +
-		  (expression float exp (var_ref x))
-		  (expression float exp (expression float neg (var_ref x))))))))
-   (signature vec2
-     (parameters
-       (declare (in) vec2 x))
-     ((return (expression vec2 /
-                (expression vec2 -
-		  (expression vec2 exp (var_ref x))
-		  (expression vec2 exp (expression vec2 neg (var_ref x))))
-                (expression vec2 +
-		  (expression vec2 exp (var_ref x))
-		  (expression vec2 exp (expression vec2 neg (var_ref x))))))))
-   (signature vec3
-     (parameters
-       (declare (in) vec3 x))
-     ((return (expression vec3 /
-                (expression vec3 -
-		  (expression vec3 exp (var_ref x))
-		  (expression vec3 exp (expression vec3 neg (var_ref x))))
-                (expression vec3 +
-		  (expression vec3 exp (var_ref x))
-		  (expression vec3 exp (expression vec3 neg (var_ref x))))))))
-   (signature vec4
-     (parameters
-       (declare (in) vec4 x))
-     ((return (expression vec4 /
-                (expression vec4 -
-		  (expression vec4 exp (var_ref x))
-		  (expression vec4 exp (expression vec4 neg (var_ref x))))
-                (expression vec4 +
-		  (expression vec4 exp (var_ref x))
-		  (expression vec4 exp (expression vec4 neg (var_ref x))))))))
-))
diff --git a/src/glsl/builtins/130/texelFetch b/src/glsl/builtins/130/texelFetch
deleted file mode 100644
index d51ce65a89..0000000000
--- a/src/glsl/builtins/130/texelFetch
+++ /dev/null
@@ -1,107 +0,0 @@
-((function texelFetch
-   (signature vec4
-     (parameters
-       (declare (in) sampler1D sampler)
-       (declare (in) int P) 
-       (declare (in) int lod) )
-     ((return (txf (var_ref sampler) (var_ref P) (0 0 0) (var_ref lod) ))))
-
-   (signature ivec4
-     (parameters
-       (declare (in) isampler1D sampler)
-       (declare (in) int P) 
-       (declare (in) int lod) )
-     ((return (txf (var_ref sampler) (var_ref P) (0 0 0) (var_ref lod) ))))
-
-   (signature uvec4
-     (parameters
-       (declare (in) usampler1D sampler)
-       (declare (in) int P) 
-       (declare (in) int lod) )
-     ((return (txf (var_ref sampler) (var_ref P) (0 0 0) (var_ref lod) ))))
-
-   (signature vec4
-     (parameters
-       (declare (in) sampler2D sampler)
-       (declare (in) ivec2 P) 
-       (declare (in) int lod) )
-     ((return (txf (var_ref sampler) (var_ref P) (0 0 0) (var_ref lod) ))))
-
-   (signature ivec4
-     (parameters
-       (declare (in) isampler2D sampler)
-       (declare (in) ivec2 P) 
-       (declare (in) int lod) )
-     ((return (txf (var_ref sampler) (var_ref P) (0 0 0) (var_ref lod) ))))
-
-   (signature uvec4
-     (parameters
-       (declare (in) usampler2D sampler)
-       (declare (in) ivec2 P) 
-       (declare (in) int lod) )
-     ((return (txf (var_ref sampler) (var_ref P) (0 0 0) (var_ref lod) ))))
-
-   (signature vec4
-     (parameters
-       (declare (in) sampler3D sampler)
-       (declare (in) ivec3 P) 
-       (declare (in) int lod) )
-     ((return (txf (var_ref sampler) (var_ref P) (0 0 0) (var_ref lod) ))))
-
-   (signature ivec4
-     (parameters
-       (declare (in) isampler3D sampler)
-       (declare (in) ivec3 P) 
-       (declare (in) int lod) )
-     ((return (txf (var_ref sampler) (var_ref P) (0 0 0) (var_ref lod) ))))
-
-   (signature uvec4
-     (parameters
-       (declare (in) usampler3D sampler)
-       (declare (in) ivec3 P) 
-       (declare (in) int lod) )
-     ((return (txf (var_ref sampler) (var_ref P) (0 0 0) (var_ref lod) ))))
-
-   (signature vec4
-     (parameters
-       (declare (in) sampler1DArray sampler)
-       (declare (in) ivec2 P) 
-       (declare (in) int lod) )
-     ((return (txf (var_ref sampler) (var_ref P) (0 0 0) (var_ref lod) ))))
-
-   (signature ivec4
-     (parameters
-       (declare (in) isampler1DArray sampler)
-       (declare (in) ivec2 P) 
-       (declare (in) int lod) )
-     ((return (txf (var_ref sampler) (var_ref P) (0 0 0) (var_ref lod) ))))
-
-   (signature uvec4
-     (parameters
-       (declare (in) usampler1DArray sampler)
-       (declare (in) ivec2 P) 
-       (declare (in) int lod) )
-     ((return (txf (var_ref sampler) (var_ref P) (0 0 0) (var_ref lod) ))))
-
-   (signature vec4
-     (parameters
-       (declare (in) sampler2DArray sampler)
-       (declare (in) ivec3 P) 
-       (declare (in) int lod) )
-     ((return (txf (var_ref sampler) (var_ref P) (0 0 0) (var_ref lod) ))))
-
-   (signature ivec4
-     (parameters
-       (declare (in) isampler2DArray sampler)
-       (declare (in) ivec3 P) 
-       (declare (in) int lod) )
-     ((return (txf (var_ref sampler) (var_ref P) (0 0 0) (var_ref lod) ))))
-
-   (signature uvec4
-     (parameters
-       (declare (in) usampler2DArray sampler)
-       (declare (in) ivec3 P) 
-       (declare (in) int lod) )
-     ((return (txf (var_ref sampler) (var_ref P) (0 0 0) (var_ref lod) ))))
-
-))
diff --git a/src/glsl/builtins/130/texture b/src/glsl/builtins/130/texture
deleted file mode 100644
index b170b58309..0000000000
--- a/src/glsl/builtins/130/texture
+++ /dev/null
@@ -1,110 +0,0 @@
-((function texture
-   (signature vec4
-     (parameters
-       (declare (in) sampler1D sampler)
-       (declare (in) float P) )
-     ((return (tex (var_ref sampler) (var_ref P) (0 0 0) 1 () ))))
-
-   (signature ivec4
-     (parameters
-       (declare (in) isampler1D sampler)
-       (declare (in) float P) )
-     ((return (tex (var_ref sampler) (var_ref P) (0 0 0) 1 () ))))
-
-   (signature uvec4
-     (parameters
-       (declare (in) usampler1D sampler)
-       (declare (in) float P) )
-     ((return (tex (var_ref sampler) (var_ref P) (0 0 0) 1 () ))))
-
-   (signature vec4
-     (parameters
-       (declare (in) sampler2D sampler)
-       (declare (in) vec2 P) )
-     ((return (tex (var_ref sampler) (var_ref P) (0 0 0) 1 () ))))
-
-   (signature ivec4
-     (parameters
-       (declare (in) isampler2D sampler)
-       (declare (in) vec2 P) )
-     ((return (tex (var_ref sampler) (var_ref P) (0 0 0) 1 () ))))
-
-   (signature uvec4
-     (parameters
-       (declare (in) usampler2D sampler)
-       (declare (in) vec2 P) )
-     ((return (tex (var_ref sampler) (var_ref P) (0 0 0) 1 () ))))
-
-   (signature vec4
-     (parameters
-       (declare (in) sampler3D sampler)
-       (declare (in) vec3 P) )
-     ((return (tex (var_ref sampler) (var_ref P) (0 0 0) 1 () ))))
-
-   (signature ivec4
-     (parameters
-       (declare (in) isampler3D sampler)
-       (declare (in) vec3 P) )
-     ((return (tex (var_ref sampler) (var_ref P) (0 0 0) 1 () ))))
-
-   (signature uvec4
-     (parameters
-       (declare (in) usampler3D sampler)
-       (declare (in) vec3 P) )
-     ((return (tex (var_ref sampler) (var_ref P) (0 0 0) 1 () ))))
-
-   (signature vec4
-     (parameters
-       (declare (in) samplerCube sampler)
-       (declare (in) vec3 P) )
-     ((return (tex (var_ref sampler) (var_ref P) (0 0 0) 1 () ))))
-
-   (signature ivec4
-     (parameters
-       (declare (in) isamplerCube sampler)
-       (declare (in) vec3 P) )
-     ((return (tex (var_ref sampler) (var_ref P) (0 0 0) 1 () ))))
-
-   (signature uvec4
-     (parameters
-       (declare (in) usamplerCube sampler)
-       (declare (in) vec3 P) )
-     ((return (tex (var_ref sampler) (var_ref P) (0 0 0) 1 () ))))
-
-   (signature vec4
-     (parameters
-       (declare (in) sampler1DArray sampler)
-       (declare (in) vec2 P) )
-     ((return (tex (var_ref sampler) (var_ref P) (0 0 0) 1 () ))))
-
-   (signature ivec4
-     (parameters
-       (declare (in) isampler1DArray sampler)
-       (declare (in) vec2 P) )
-     ((return (tex (var_ref sampler) (var_ref P) (0 0 0) 1 () ))))
-
-   (signature uvec4
-     (parameters
-       (declare (in) usampler1DArray sampler)
-       (declare (in) vec2 P) )
-     ((return (tex (var_ref sampler) (var_ref P) (0 0 0) 1 () ))))
-
-   (signature vec4
-     (parameters
-       (declare (in) sampler2DArray sampler)
-       (declare (in) vec3 P) )
-     ((return (tex (var_ref sampler) (var_ref P) (0 0 0) 1 () ))))
-
-   (signature ivec4
-     (parameters
-       (declare (in) isampler2DArray sampler)
-       (declare (in) vec3 P) )
-     ((return (tex (var_ref sampler) (var_ref P) (0 0 0) 1 () ))))
-
-   (signature uvec4
-     (parameters
-       (declare (in) usampler2DArray sampler)
-       (declare (in) vec3 P) )
-     ((return (tex (var_ref sampler) (var_ref P) (0 0 0) 1 () ))))
-
-))
diff --git a/src/glsl/builtins/130/textureGrad b/src/glsl/builtins/130/textureGrad
deleted file mode 100644
index 0ef428c224..0000000000
--- a/src/glsl/builtins/130/textureGrad
+++ /dev/null
@@ -1,147 +0,0 @@
-((function textureGrad
-   (signature vec4
-     (parameters
-       (declare (in) sampler1D sampler)
-       (declare (in) float P) 
-       (declare (in) float dPdx) 
-       (declare (in) float dPdy) )
-     ((return (txd (var_ref sampler) (var_ref P) (0 0 0) 1 () ((var_ref dPdx) (var_ref dPdy)) ))))
-
-   (signature ivec4
-     (parameters
-       (declare (in) isampler1D sampler)
-       (declare (in) float P) 
-       (declare (in) float dPdx) 
-       (declare (in) float dPdy) )
-     ((return (txd (var_ref sampler) (var_ref P) (0 0 0) 1 () ((var_ref dPdx) (var_ref dPdy)) ))))
-
-   (signature uvec4
-     (parameters
-       (declare (in) usampler1D sampler)
-       (declare (in) float P) 
-       (declare (in) float dPdx) 
-       (declare (in) float dPdy) )
-     ((return (txd (var_ref sampler) (var_ref P) (0 0 0) 1 () ((var_ref dPdx) (var_ref dPdy)) ))))
-
-   (signature vec4
-     (parameters
-       (declare (in) sampler2D sampler)
-       (declare (in) vec2 P) 
-       (declare (in) vec2 dPdx) 
-       (declare (in) vec2 dPdy) )
-     ((return (txd (var_ref sampler) (var_ref P) (0 0 0) 1 () ((var_ref dPdx) (var_ref dPdy)) ))))
-
-   (signature ivec4
-     (parameters
-       (declare (in) isampler2D sampler)
-       (declare (in) vec2 P) 
-       (declare (in) vec2 dPdx) 
-       (declare (in) vec2 dPdy) )
-     ((return (txd (var_ref sampler) (var_ref P) (0 0 0) 1 () ((var_ref dPdx) (var_ref dPdy)) ))))
-
-   (signature uvec4
-     (parameters
-       (declare (in) usampler2D sampler)
-       (declare (in) vec2 P) 
-       (declare (in) vec2 dPdx) 
-       (declare (in) vec2 dPdy) )
-     ((return (txd (var_ref sampler) (var_ref P) (0 0 0) 1 () ((var_ref dPdx) (var_ref dPdy)) ))))
-
-   (signature vec4
-     (parameters
-       (declare (in) sampler3D sampler)
-       (declare (in) vec3 P) 
-       (declare (in) vec3 dPdx) 
-       (declare (in) vec3 dPdy) )
-     ((return (txd (var_ref sampler) (var_ref P) (0 0 0) 1 () ((var_ref dPdx) (var_ref dPdy)) ))))
-
-   (signature ivec4
-     (parameters
-       (declare (in) isampler3D sampler)
-       (declare (in) vec3 P) 
-       (declare (in) vec3 dPdx) 
-       (declare (in) vec3 dPdy) )
-     ((return (txd (var_ref sampler) (var_ref P) (0 0 0) 1 () ((var_ref dPdx) (var_ref dPdy)) ))))
-
-   (signature uvec4
-     (parameters
-       (declare (in) usampler3D sampler)
-       (declare (in) vec3 P) 
-       (declare (in) vec3 dPdx) 
-       (declare (in) vec3 dPdy) )
-     ((return (txd (var_ref sampler) (var_ref P) (0 0 0) 1 () ((var_ref dPdx) (var_ref dPdy)) ))))
-
-   (signature vec4
-     (parameters
-       (declare (in) samplerCube sampler)
-       (declare (in) vec3 P) 
-       (declare (in) vec3 dPdx) 
-       (declare (in) vec3 dPdy) )
-     ((return (txd (var_ref sampler) (var_ref P) (0 0 0) 1 () ((var_ref dPdx) (var_ref dPdy)) ))))
-
-   (signature ivec4
-     (parameters
-       (declare (in) isamplerCube sampler)
-       (declare (in) vec3 P) 
-       (declare (in) vec3 dPdx) 
-       (declare (in) vec3 dPdy) )
-     ((return (txd (var_ref sampler) (var_ref P) (0 0 0) 1 () ((var_ref dPdx) (var_ref dPdy)) ))))
-
-   (signature uvec4
-     (parameters
-       (declare (in) usamplerCube sampler)
-       (declare (in) vec3 P) 
-       (declare (in) vec3 dPdx) 
-       (declare (in) vec3 dPdy) )
-     ((return (txd (var_ref sampler) (var_ref P) (0 0 0) 1 () ((var_ref dPdx) (var_ref dPdy)) ))))
-
-   (signature vec4
-     (parameters
-       (declare (in) sampler1DArray sampler)
-       (declare (in) vec2 P) 
-       (declare (in) vec2 dPdx) 
-       (declare (in) vec2 dPdy) )
-     ((return (txd (var_ref sampler) (var_ref P) (0 0 0) 1 () ((var_ref dPdx) (var_ref dPdy)) ))))
-
-   (signature ivec4
-     (parameters
-       (declare (in) isampler1DArray sampler)
-       (declare (in) vec2 P) 
-       (declare (in) vec2 dPdx) 
-       (declare (in) vec2 dPdy) )
-     ((return (txd (var_ref sampler) (var_ref P) (0 0 0) 1 () ((var_ref dPdx) (var_ref dPdy)) ))))
-
-   (signature uvec4
-     (parameters
-       (declare (in) usampler1DArray sampler)
-       (declare (in) vec2 P) 
-       (declare (in) vec2 dPdx) 
-       (declare (in) vec2 dPdy) )
-     ((return (txd (var_ref sampler) (var_ref P) (0 0 0) 1 () ((var_ref dPdx) (var_ref dPdy)) ))))
-
-   (signature vec4
-     (parameters
-       (declare (in) sampler2DArray sampler)
-       (declare (in) vec3 P) 
-       (declare (in) vec3 dPdx) 
-       (declare (in) vec3 dPdy) )
-     ((return (txd (var_ref sampler) (var_ref P) (0 0 0) 1 () ((var_ref dPdx) (var_ref dPdy)) ))))
-
-   (signature ivec4
-     (parameters
-       (declare (in) isampler2DArray sampler)
-       (declare (in) vec3 P) 
-       (declare (in) vec3 dPdx) 
-       (declare (in) vec3 dPdy) )
-     ((return (txd (var_ref sampler) (var_ref P) (0 0 0) 1 () ((var_ref dPdx) (var_ref dPdy)) ))))
-
-   (signature uvec4
-     (parameters
-       (declare (in) usampler2DArray sampler)
-       (declare (in) vec3 P) 
-       (declare (in) vec3 dPdx) 
-       (declare (in) vec3 dPdy) )
-     ((return (txd (var_ref sampler) (var_ref P) (0 0 0) 1 () ((var_ref dPdx) (var_ref dPdy)) ))))
-
-)
-)
diff --git a/src/glsl/builtins/130/textureLod b/src/glsl/builtins/130/textureLod
deleted file mode 100644
index 7d7059d848..0000000000
--- a/src/glsl/builtins/130/textureLod
+++ /dev/null
@@ -1,128 +0,0 @@
-((function textureLod
-   (signature vec4
-     (parameters
-       (declare (in) sampler1D sampler)
-       (declare (in) float P) 
-       (declare (in) float lod) )
-     ((return (txl (var_ref sampler) (var_ref P) (0 0 0) 1 () (var_ref lod) ))))
-
-   (signature ivec4
-     (parameters
-       (declare (in) isampler1D sampler)
-       (declare (in) float P) 
-       (declare (in) float lod) )
-     ((return (txl (var_ref sampler) (var_ref P) (0 0 0) 1 () (var_ref lod) ))))
-
-   (signature uvec4
-     (parameters
-       (declare (in) usampler1D sampler)
-       (declare (in) float P) 
-       (declare (in) float lod) )
-     ((return (txl (var_ref sampler) (var_ref P) (0 0 0) 1 () (var_ref lod) ))))
-
-   (signature vec4
-     (parameters
-       (declare (in) sampler2D sampler)
-       (declare (in) vec2 P) 
-       (declare (in) float lod) )
-     ((return (txl (var_ref sampler) (var_ref P) (0 0 0) 1 () (var_ref lod) ))))
-
-   (signature ivec4
-     (parameters
-       (declare (in) isampler2D sampler)
-       (declare (in) vec2 P) 
-       (declare (in) float lod) )
-     ((return (txl (var_ref sampler) (var_ref P) (0 0 0) 1 () (var_ref lod) ))))
-
-   (signature uvec4
-     (parameters
-       (declare (in) usampler2D sampler)
-       (declare (in) vec2 P) 
-       (declare (in) float lod) )
-     ((return (txl (var_ref sampler) (var_ref P) (0 0 0) 1 () (var_ref lod) ))))
-
-   (signature vec4
-     (parameters
-       (declare (in) sampler3D sampler)
-       (declare (in) vec3 P) 
-       (declare (in) float lod) )
-     ((return (txl (var_ref sampler) (var_ref P) (0 0 0) 1 () (var_ref lod) ))))
-
-   (signature ivec4
-     (parameters
-       (declare (in) isampler3D sampler)
-       (declare (in) vec3 P) 
-       (declare (in) float lod) )
-     ((return (txl (var_ref sampler) (var_ref P) (0 0 0) 1 () (var_ref lod) ))))
-
-   (signature uvec4
-     (parameters
-       (declare (in) usampler3D sampler)
-       (declare (in) vec3 P) 
-       (declare (in) float lod) )
-     ((return (txl (var_ref sampler) (var_ref P) (0 0 0) 1 () (var_ref lod) ))))
-
-   (signature vec4
-     (parameters
-       (declare (in) samplerCube sampler)
-       (declare (in) vec3 P) 
-       (declare (in) float lod) )
-     ((return (txl (var_ref sampler) (var_ref P) (0 0 0) 1 () (var_ref lod) ))))
-
-   (signature ivec4
-     (parameters
-       (declare (in) isamplerCube sampler)
-       (declare (in) vec3 P) 
-       (declare (in) float lod) )
-     ((return (txl (var_ref sampler) (var_ref P) (0 0 0) 1 () (var_ref lod) ))))
-
-   (signature uvec4
-     (parameters
-       (declare (in) usamplerCube sampler)
-       (declare (in) vec3 P) 
-       (declare (in) float lod) )
-     ((return (txl (var_ref sampler) (var_ref P) (0 0 0) 1 () (var_ref lod) ))))
-
-   (signature vec4
-     (parameters
-       (declare (in) sampler1DArray sampler)
-       (declare (in) vec2 P) 
-       (declare (in) float lod) )
-     ((return (txl (var_ref sampler) (var_ref P) (0 0 0) 1 () (var_ref lod) ))))
-
-   (signature ivec4
-     (parameters
-       (declare (in) isampler1DArray sampler)
-       (declare (in) vec2 P) 
-       (declare (in) float lod) )
-     ((return (txl (var_ref sampler) (var_ref P) (0 0 0) 1 () (var_ref lod) ))))
-
-   (signature uvec4
-     (parameters
-       (declare (in) usampler1DArray sampler)
-       (declare (in) vec2 P) 
-       (declare (in) float lod) )
-     ((return (txl (var_ref sampler) (var_ref P) (0 0 0) 1 () (var_ref lod) ))))
-
-   (signature vec4
-     (parameters
-       (declare (in) sampler2DArray sampler)
-       (declare (in) vec3 P) 
-       (declare (in) float lod) )
-     ((return (txl (var_ref sampler) (var_ref P) (0 0 0) 1 () (var_ref lod) ))))
-
-   (signature ivec4
-     (parameters
-       (declare (in) isampler2DArray sampler)
-       (declare (in) vec3 P) 
-       (declare (in) float lod) )
-     ((return (txl (var_ref sampler) (var_ref P) (0 0 0) 1 () (var_ref lod) ))))
-
-   (signature uvec4
-     (parameters
-       (declare (in) usampler2DArray sampler)
-       (declare (in) vec3 P) 
-       (declare (in) float lod) )
-     ((return (txl (var_ref sampler) (var_ref P) (0 0 0) 1 () (var_ref lod) ))))
-
-))
diff --git a/src/glsl/builtins/130/textureProj b/src/glsl/builtins/130/textureProj
deleted file mode 100644
index 40ea1c2af6..0000000000
--- a/src/glsl/builtins/130/textureProj
+++ /dev/null
@@ -1,92 +0,0 @@
-((function textureProj
-   (signature vec4
-     (parameters
-       (declare (in) sampler1D sampler)
-       (declare (in) vec2 P) )
-     ((return (tex (var_ref sampler) (swiz x (var_ref P)) (0 0 0) (swiz y (var_ref P)) () ))))
-
-   (signature ivec4
-     (parameters
-       (declare (in) isampler1D sampler)
-       (declare (in) vec2 P) )
-     ((return (tex (var_ref sampler) (swiz x (var_ref P)) (0 0 0) (swiz y (var_ref P)) () ))))
-
-   (signature uvec4
-     (parameters
-       (declare (in) usampler1D sampler)
-       (declare (in) vec2 P) )
-     ((return (tex (var_ref sampler) (swiz x (var_ref P)) (0 0 0) (swiz y (var_ref P)) () ))))
-
-   (signature vec4
-     (parameters
-       (declare (in) sampler1D sampler)
-       (declare (in) vec4 P) )
-     ((return (tex (var_ref sampler) (swiz x (var_ref P)) (0 0 0) (swiz w (var_ref P)) () ))))
-
-   (signature ivec4
-     (parameters
-       (declare (in) isampler1D sampler)
-       (declare (in) vec4 P) )
-     ((return (tex (var_ref sampler) (swiz x (var_ref P)) (0 0 0) (swiz w (var_ref P)) () ))))
-
-   (signature uvec4
-     (parameters
-       (declare (in) usampler1D sampler)
-       (declare (in) vec4 P) )
-     ((return (tex (var_ref sampler) (swiz x (var_ref P)) (0 0 0) (swiz w (var_ref P)) () ))))
-
-   (signature vec4
-     (parameters
-       (declare (in) sampler2D sampler)
-       (declare (in) vec3 P) )
-     ((return (tex (var_ref sampler) (swiz xy (var_ref P)) (0 0 0) (swiz z (var_ref P)) () ))))
-
-   (signature ivec4
-     (parameters
-       (declare (in) isampler2D sampler)
-       (declare (in) vec3 P) )
-     ((return (tex (var_ref sampler) (swiz xy (var_ref P)) (0 0 0) (swiz z (var_ref P)) () ))))
-
-   (signature uvec4
-     (parameters
-       (declare (in) usampler2D sampler)
-       (declare (in) vec3 P) )
-     ((return (tex (var_ref sampler) (swiz xy (var_ref P)) (0 0 0) (swiz z (var_ref P)) () ))))
-
-   (signature vec4
-     (parameters
-       (declare (in) sampler2D sampler)
-       (declare (in) vec4 P) )
-     ((return (tex (var_ref sampler) (swiz xy (var_ref P)) (0 0 0) (swiz w (var_ref P)) () ))))
-
-   (signature ivec4
-     (parameters
-       (declare (in) isampler2D sampler)
-       (declare (in) vec4 P) )
-     ((return (tex (var_ref sampler) (swiz xy (var_ref P)) (0 0 0) (swiz w (var_ref P)) () ))))
-
-   (signature uvec4
-     (parameters
-       (declare (in) usampler2D sampler)
-       (declare (in) vec4 P) )
-     ((return (tex (var_ref sampler) (swiz xy (var_ref P)) (0 0 0) (swiz w (var_ref P)) () ))))
-
-   (signature vec4
-     (parameters
-       (declare (in) sampler3D sampler)
-       (declare (in) vec4 P) )
-     ((return (tex (var_ref sampler) (swiz xyz (var_ref P)) (0 0 0) (swiz w (var_ref P)) () ))))
-
-   (signature ivec4
-     (parameters
-       (declare (in) isampler3D sampler)
-       (declare (in) vec4 P) )
-     ((return (tex (var_ref sampler) (swiz xyz (var_ref P)) (0 0 0) (swiz w (var_ref P)) () ))))
-
-   (signature uvec4
-     (parameters
-       (declare (in) usampler3D sampler)
-       (declare (in) vec4 P) )
-     ((return (tex (var_ref sampler) (swiz xyz (var_ref P)) (0 0 0) (swiz w (var_ref P)) () ))))
-
-))
diff --git a/src/glsl/builtins/130/textureProjGrad b/src/glsl/builtins/130/textureProjGrad
deleted file mode 100644
index b4bfa58c12..0000000000
--- a/src/glsl/builtins/130/textureProjGrad
+++ /dev/null
@@ -1,122 +0,0 @@
-((function textureProjGrad
-   (signature vec4
-     (parameters
-       (declare (in) sampler1D sampler)
-       (declare (in) vec2 P) 
-       (declare (in) float dPdx) 
-       (declare (in) float dPdy) )
-     ((return (txd (var_ref sampler) (swiz x (var_ref P)) (0 0 0) (swiz y (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))
-
-   (signature ivec4
-     (parameters
-       (declare (in) isampler1D sampler)
-       (declare (in) vec2 P) 
-       (declare (in) float dPdx) 
-       (declare (in) float dPdy) )
-     ((return (txd (var_ref sampler) (swiz x (var_ref P)) (0 0 0) (swiz y (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))
-
-   (signature uvec4
-     (parameters
-       (declare (in) usampler1D sampler)
-       (declare (in) vec2 P) 
-       (declare (in) float dPdx) 
-       (declare (in) float dPdy) )
-     ((return (txd (var_ref sampler) (swiz x (var_ref P)) (0 0 0) (swiz y (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))
-
-   (signature vec4
-     (parameters
-       (declare (in) sampler1D sampler)
-       (declare (in) vec4 P) 
-       (declare (in) float dPdx) 
-       (declare (in) float dPdy) )
-     ((return (txd (var_ref sampler) (swiz x (var_ref P)) (0 0 0) (swiz w (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))
-
-   (signature ivec4
-     (parameters
-       (declare (in) isampler1D sampler)
-       (declare (in) vec4 P) 
-       (declare (in) float dPdx) 
-       (declare (in) float dPdy) )
-     ((return (txd (var_ref sampler) (swiz x (var_ref P)) (0 0 0) (swiz w (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))
-
-   (signature uvec4
-     (parameters
-       (declare (in) usampler1D sampler)
-       (declare (in) vec4 P) 
-       (declare (in) float dPdx) 
-       (declare (in) float dPdy) )
-     ((return (txd (var_ref sampler) (swiz x (var_ref P)) (0 0 0) (swiz w (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))
-
-   (signature vec4
-     (parameters
-       (declare (in) sampler2D sampler)
-       (declare (in) vec3 P) 
-       (declare (in) vec2 dPdx) 
-       (declare (in) vec2 dPdy) )
-     ((return (txd (var_ref sampler) (swiz xy (var_ref P)) (0 0 0) (swiz z (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))
-
-   (signature ivec4
-     (parameters
-       (declare (in) isampler2D sampler)
-       (declare (in) vec3 P) 
-       (declare (in) vec2 dPdx) 
-       (declare (in) vec2 dPdy) )
-     ((return (txd (var_ref sampler) (swiz xy (var_ref P)) (0 0 0) (swiz z (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))
-
-   (signature uvec4
-     (parameters
-       (declare (in) usampler2D sampler)
-       (declare (in) vec3 P) 
-       (declare (in) vec2 dPdx) 
-       (declare (in) vec2 dPdy) )
-     ((return (txd (var_ref sampler) (swiz xy (var_ref P)) (0 0 0) (swiz z (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))
-
-   (signature vec4
-     (parameters
-       (declare (in) sampler2D sampler)
-       (declare (in) vec4 P) 
-       (declare (in) vec2 dPdx) 
-       (declare (in) vec2 dPdy) )
-     ((return (txd (var_ref sampler) (swiz xy (var_ref P)) (0 0 0) (swiz w (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))
-
-   (signature ivec4
-     (parameters
-       (declare (in) isampler2D sampler)
-       (declare (in) vec4 P) 
-       (declare (in) vec2 dPdx) 
-       (declare (in) vec2 dPdy) )
-     ((return (txd (var_ref sampler) (swiz xy (var_ref P)) (0 0 0) (swiz w (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))
-
-   (signature uvec4
-     (parameters
-       (declare (in) usampler2D sampler)
-       (declare (in) vec4 P) 
-       (declare (in) vec2 dPdx) 
-       (declare (in) vec2 dPdy) )
-     ((return (txd (var_ref sampler) (swiz xy (var_ref P)) (0 0 0) (swiz w (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))
-
-   (signature vec4
-     (parameters
-       (declare (in) sampler3D sampler)
-       (declare (in) vec4 P) 
-       (declare (in) vec3 dPdx) 
-       (declare (in) vec3 dPdy) )
-     ((return (txd (var_ref sampler) (swiz xyz (var_ref P)) (0 0 0) (swiz w (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))
-
-   (signature ivec4
-     (parameters
-       (declare (in) isampler3D sampler)
-       (declare (in) vec4 P) 
-       (declare (in) vec3 dPdx) 
-       (declare (in) vec3 dPdy) )
-     ((return (txd (var_ref sampler) (swiz xyz (var_ref P)) (0 0 0) (swiz w (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))
-
-   (signature uvec4
-     (parameters
-       (declare (in) usampler3D sampler)
-       (declare (in) vec4 P) 
-       (declare (in) vec3 dPdx) 
-       (declare (in) vec3 dPdy) )
-     ((return (txd (var_ref sampler) (swiz xyz (var_ref P)) (0 0 0) (swiz w (var_ref P)) () ((var_ref dPdx) (var_ref dPdy)) ))))
-
-))
diff --git a/src/glsl/builtins/130/textureProjLod b/src/glsl/builtins/130/textureProjLod
deleted file mode 100644
index d242f7e40f..0000000000
--- a/src/glsl/builtins/130/textureProjLod
+++ /dev/null
@@ -1,107 +0,0 @@
-((function textureProjLod
-   (signature vec4
-     (parameters
-       (declare (in) sampler1D sampler)
-       (declare (in) vec2 P) 
-       (declare (in) float lod) )
-     ((return (txl (var_ref sampler) (swiz x (var_ref P)) (0 0 0) (swiz y (var_ref P)) () (var_ref lod) ))))
-
-   (signature ivec4
-     (parameters
-       (declare (in) isampler1D sampler)
-       (declare (in) vec2 P) 
-       (declare (in) float lod) )
-     ((return (txl (var_ref sampler) (swiz x (var_ref P)) (0 0 0) (swiz y (var_ref P)) () (var_ref lod) ))))
-
-   (signature uvec4
-     (parameters
-       (declare (in) usampler1D sampler)
-       (declare (in) vec2 P) 
-       (declare (in) float lod) )
-     ((return (txl (var_ref sampler) (swiz x (var_ref P)) (0 0 0) (swiz y (var_ref P)) () (var_ref lod) ))))
-
-   (signature vec4
-     (parameters
-       (declare (in) sampler1D sampler)
-       (declare (in) vec4 P) 
-       (declare (in) float lod) )
-     ((return (txl (var_ref sampler) (swiz x (var_ref P)) (0 0 0) (swiz w (var_ref P)) () (var_ref lod) ))))
-
-   (signature ivec4
-     (parameters
-       (declare (in) isampler1D sampler)
-       (declare (in) vec4 P) 
-       (declare (in) float lod) )
-     ((return (txl (var_ref sampler) (swiz x (var_ref P)) (0 0 0) (swiz w (var_ref P)) () (var_ref lod) ))))
-
-   (signature uvec4
-     (parameters
-       (declare (in) usampler1D sampler)
-       (declare (in) vec4 P) 
-       (declare (in) float lod) )
-     ((return (txl (var_ref sampler) (swiz x (var_ref P)) (0 0 0) (swiz w (var_ref P)) () (var_ref lod) ))))
-
-   (signature vec4
-     (parameters
-       (declare (in) sampler2D sampler)
-       (declare (in) vec3 P) 
-       (declare (in) float lod) )
-     ((return (txl (var_ref sampler) (swiz xy (var_ref P)) (0 0 0) (swiz z (var_ref P)) () (var_ref lod) ))))
-
-   (signature ivec4
-     (parameters
-       (declare (in) isampler2D sampler)
-       (declare (in) vec3 P) 
-       (declare (in) float lod) )
-     ((return (txl (var_ref sampler) (swiz xy (var_ref P)) (0 0 0) (swiz z (var_ref P)) () (var_ref lod) ))))
-
-   (signature uvec4
-     (parameters
-       (declare (in) usampler2D sampler)
-       (declare (in) vec3 P) 
-       (declare (in) float lod) )
-     ((return (txl (var_ref sampler) (swiz xy (var_ref P)) (0 0 0) (swiz z (var_ref P)) () (var_ref lod) ))))
-
-   (signature vec4
-     (parameters
-       (declare (in) sampler2D sampler)
-       (declare (in) vec4 P) 
-       (declare (in) float lod) )
-     ((return (txl (var_ref sampler) (swiz xy (var_ref P)) (0 0 0) (swiz w (var_ref P)) () (var_ref lod) ))))
-
-   (signature ivec4
-     (parameters
-       (declare (in) isampler2D sampler)
-       (declare (in) vec4 P) 
-       (declare (in) float lod) )
-     ((return (txl (var_ref sampler) (swiz xy (var_ref P)) (0 0 0) (swiz w (var_ref P)) () (var_ref lod) ))))
-
-   (signature uvec4
-     (parameters
-       (declare (in) usampler2D sampler)
-       (declare (in) vec4 P) 
-       (declare (in) float lod) )
-     ((return (txl (var_ref sampler) (swiz xy (var_ref P)) (0 0 0) (swiz w (var_ref P)) () (var_ref lod) ))))
-
-   (signature vec4
-     (parameters
-       (declare (in) sampler3D sampler)
-       (declare (in) vec4 P) 
-       (declare (in) float lod) )
-     ((return (txl (var_ref sampler) (swiz xyz (var_ref P)) (0 0 0) (swiz w (var_ref P)) () (var_ref lod) ))))
-
-   (signature ivec4
-     (parameters
-       (declare (in) isampler3D sampler)
-       (declare (in) vec4 P) 
-       (declare (in) float lod) )
-     ((return (txl (var_ref sampler) (swiz xyz (var_ref P)) (0 0 0) (swiz w (var_ref P)) () (var_ref lod) ))))
-
-   (signature uvec4
-     (parameters
-       (declare (in) usampler3D sampler)
-       (declare (in) vec4 P) 
-       (declare (in) float lod) )
-     ((return (txl (var_ref sampler) (swiz xyz (var_ref P)) (0 0 0) (swiz w (var_ref P)) () (var_ref lod) ))))
-
-))