Backward incompatible: Turn on PureOperatorBuiltins: use only enum-based…

Backward incompatible: Turn on PureOperatorBuiltins: use only enum-based built-in functions in the AST. If this breaks your AST consumer, best is to modify it to test against the enum values instead of doing string comparisons on built-in function names. This is the reason the change was made. If you need the old behavior, you should be able to get it back by changing PureOperatorBuiltins to be false instead of true. This path will work for a while, but is marked deprecated. Also, the old behavior is tagged as release 2.4.

Backward incompatible: Turn on PureOperatorBuiltins: use only enum-based…
fc51d284 · John Kessenich · a32d8f62 · fc51d284 · fc51d284 · fc51d284
Commit fc51d284 authored Aug 19, 2015 by John Kessenich
41 changed files
--- a/SPIRV/GlslangToSpv.cpp
+++ b/SPIRV/GlslangToSpv.cpp
--- a/Test/baseResults/100.frag.out
+++ b/Test/baseResults/100.frag.out
--- a/Test/baseResults/120.frag.out
+++ b/Test/baseResults/120.frag.out
--- a/Test/baseResults/120.vert.out
+++ b/Test/baseResults/120.vert.out
@@ -183,7 +183,7 @@ ERROR: node is still EOpNull!
 0:98        0.000000
 0:100      Constant:
 0:100        0.841471
-0:101      Function Call: texture2D(s21;vf2; (global 4-component vector of float)
+0:101      texture (global 4-component vector of float)
 0:101        's2D' (uniform sampler2D)
 0:101        Constant:
 0:101          0.000000
@@ -502,7 +502,7 @@ ERROR: node is still EOpNull!
 0:98        0.000000
 0:100      Constant:
 0:100        0.841471
-0:101      Function Call: texture2D(s21;vf2; (global 4-component vector of float)
+0:101      texture (global 4-component vector of float)
 0:101        's2D' (uniform sampler2D)
 0:101        Constant:
 0:101          0.000000

--- a/Test/baseResults/130.frag.out
+++ b/Test/baseResults/130.frag.out
--- a/Test/baseResults/130.vert.out
+++ b/Test/baseResults/130.vert.out
@@ -50,7 +50,7 @@ ERROR: node is still EOpNull!
 0:29      move second child to first child (temp uint)
 0:29        'i' (temp uint)
 0:29        direct index (temp uint)
-0:29          Function Call: texture(us21;vf2; (global 4-component vector of uint)
+0:29          texture (global 4-component vector of uint)
 0:29            'us2D' (uniform usampler2D)
 0:29            Convert int to float (temp 2-component vector of float)
 0:29              'x' (in 2-component vector of int)
@@ -199,7 +199,7 @@ ERROR: node is still EOpNull!
 0:29      move second child to first child (temp uint)
 0:29        'i' (temp uint)
 0:29        direct index (temp uint)
-0:29          Function Call: texture(us21;vf2; (global 4-component vector of uint)
+0:29          texture (global 4-component vector of uint)
 0:29            'us2D' (uniform usampler2D)
 0:29            Convert int to float (temp 2-component vector of float)
 0:29              'x' (in 2-component vector of int)

--- a/Test/baseResults/140.vert.out
+++ b/Test/baseResults/140.vert.out
@@ -32,7 +32,7 @@ ERROR: node is still EOpNull!
 0:13      add second child into first child (temp int)
 0:13        'id' (temp int)
 0:13        direct index (temp int)
-0:13          Function Call: texelFetch(isB1;i1; (global 4-component vector of int)
+0:13          textureFetch (global 4-component vector of int)
 0:13            'sbuf' (uniform isamplerBuffer)
 0:13            Constant:
 0:13              8 (const int)
@@ -57,7 +57,7 @@ ERROR: node is still EOpNull!
 0:50      Sequence
 0:50        move second child to first child (temp 4-component vector of float)
 0:50          'v' (temp 4-component vector of float)
-0:50          Function Call: texelFetch(sR21;vi2; (global 4-component vector of float)
+0:50          textureFetch (global 4-component vector of float)
 0:50            's2dr' (uniform sampler2DRect)
 0:50            'itloc2' (in 2-component vector of int)
 0:51      add second child into first child (temp 4-component vector of float)
@@ -66,7 +66,7 @@ ERROR: node is still EOpNull!
 0:51          0.000000
 0:52      add second child into first child (temp 4-component vector of float)
 0:52        'v' (temp 4-component vector of float)
-0:52        Function Call: texture(sR21;vf2; (global 4-component vector of float)
+0:52        texture (global 4-component vector of float)
 0:52          's2dr' (uniform sampler2DRect)
 0:52          'tloc2' (in 2-component vector of float)
 0:53      add second child into first child (temp 4-component vector of float)
@@ -75,22 +75,22 @@ ERROR: node is still EOpNull!
 0:53          0.000000
 0:54      add second child into first child (temp 4-component vector of float)
 0:54        'v' (temp 4-component vector of float)
-0:54        Function Call: texture(sSR21;vf3; (global float)
+0:54        texture (global float)
 0:54          's2drs' (uniform sampler2DRectShadow)
 0:54          'tloc3' (in 3-component vector of float)
 0:55      add second child into first child (temp 4-component vector of float)
 0:55        'v' (temp 4-component vector of float)
-0:55        Function Call: textureProj(sR21;vf3; (global 4-component vector of float)
+0:55        textureProj (global 4-component vector of float)
 0:55          's2dr' (uniform sampler2DRect)
 0:55          'tloc3' (in 3-component vector of float)
 0:56      add second child into first child (temp 4-component vector of float)
 0:56        'v' (temp 4-component vector of float)
-0:56        Function Call: textureProj(sR21;vf4; (global 4-component vector of float)
+0:56        textureProj (global 4-component vector of float)
 0:56          's2dr' (uniform sampler2DRect)
 0:56          'tloc4' (in 4-component vector of float)
 0:57      add second child into first child (temp 4-component vector of float)
 0:57        'v' (temp 4-component vector of float)
-0:57        Function Call: textureProjGradOffset(sR21;vf4;vf2;vf2;vi2; (global 4-component vector of float)
+0:57        textureProjGradOffset (global 4-component vector of float)
 0:57          's2dr' (uniform sampler2DRect)
 0:57          'tloc4' (in 4-component vector of float)
 0:57          Constant:
@@ -104,7 +104,7 @@ ERROR: node is still EOpNull!
 0:57            2 (const int)
 0:58      add second child into first child (temp 4-component vector of float)
 0:58        'v' (temp 4-component vector of float)
-0:58        Function Call: textureProjGradOffset(sSR21;vf4;vf2;vf2;vi2; (global float)
+0:58        textureProjGradOffset (global float)
 0:58          's2drs' (uniform sampler2DRectShadow)
 0:58          'tloc4' (in 4-component vector of float)
 0:58          Constant:
@@ -162,7 +162,7 @@ ERROR: node is still EOpNull!
 0:13      add second child into first child (temp int)
 0:13        'id' (temp int)
 0:13        direct index (temp int)
-0:13          Function Call: texelFetch(isB1;i1; (global 4-component vector of int)
+0:13          textureFetch (global 4-component vector of int)
 0:13            'sbuf' (uniform isamplerBuffer)
 0:13            Constant:
 0:13              8 (const int)
@@ -187,7 +187,7 @@ ERROR: node is still EOpNull!
 0:50      Sequence
 0:50        move second child to first child (temp 4-component vector of float)
 0:50          'v' (temp 4-component vector of float)
-0:50          Function Call: texelFetch(sR21;vi2; (global 4-component vector of float)
+0:50          textureFetch (global 4-component vector of float)
 0:50            's2dr' (uniform sampler2DRect)
 0:50            'itloc2' (in 2-component vector of int)
 0:51      add second child into first child (temp 4-component vector of float)
@@ -196,7 +196,7 @@ ERROR: node is still EOpNull!
 0:51          0.000000
 0:52      add second child into first child (temp 4-component vector of float)
 0:52        'v' (temp 4-component vector of float)
-0:52        Function Call: texture(sR21;vf2; (global 4-component vector of float)
+0:52        texture (global 4-component vector of float)
 0:52          's2dr' (uniform sampler2DRect)
 0:52          'tloc2' (in 2-component vector of float)
 0:53      add second child into first child (temp 4-component vector of float)
@@ -205,22 +205,22 @@ ERROR: node is still EOpNull!
 0:53          0.000000
 0:54      add second child into first child (temp 4-component vector of float)
 0:54        'v' (temp 4-component vector of float)
-0:54        Function Call: texture(sSR21;vf3; (global float)
+0:54        texture (global float)
 0:54          's2drs' (uniform sampler2DRectShadow)
 0:54          'tloc3' (in 3-component vector of float)
 0:55      add second child into first child (temp 4-component vector of float)
 0:55        'v' (temp 4-component vector of float)
-0:55        Function Call: textureProj(sR21;vf3; (global 4-component vector of float)
+0:55        textureProj (global 4-component vector of float)
 0:55          's2dr' (uniform sampler2DRect)
 0:55          'tloc3' (in 3-component vector of float)
 0:56      add second child into first child (temp 4-component vector of float)
 0:56        'v' (temp 4-component vector of float)
-0:56        Function Call: textureProj(sR21;vf4; (global 4-component vector of float)
+0:56        textureProj (global 4-component vector of float)
 0:56          's2dr' (uniform sampler2DRect)
 0:56          'tloc4' (in 4-component vector of float)
 0:57      add second child into first child (temp 4-component vector of float)
 0:57        'v' (temp 4-component vector of float)
-0:57        Function Call: textureProjGradOffset(sR21;vf4;vf2;vf2;vi2; (global 4-component vector of float)
+0:57        textureProjGradOffset (global 4-component vector of float)
 0:57          's2dr' (uniform sampler2DRect)
 0:57          'tloc4' (in 4-component vector of float)
 0:57          Constant:
@@ -234,7 +234,7 @@ ERROR: node is still EOpNull!
 0:57            2 (const int)
 0:58      add second child into first child (temp 4-component vector of float)
 0:58        'v' (temp 4-component vector of float)
-0:58        Function Call: textureProjGradOffset(sSR21;vf4;vf2;vf2;vi2; (global float)
+0:58        textureProjGradOffset (global float)
 0:58          's2drs' (uniform sampler2DRectShadow)
 0:58          'tloc4' (in 4-component vector of float)
 0:58          Constant:

--- a/Test/baseResults/150.frag.out
+++ b/Test/baseResults/150.frag.out
@@ -28,51 +28,51 @@ ERROR: node is still EOpNull!
 0:33      Sequence
 0:33        move second child to first child (temp 2-component vector of int)
 0:33          't11' (temp 2-component vector of int)
-0:33          Function Call: textureSize(s2M1; (global 2-component vector of int)
+0:33          textureSize (global 2-component vector of int)
 0:33            'sms' (uniform sampler2DMS)
 0:34      Sequence
 0:34        move second child to first child (temp 2-component vector of int)
 0:34          't12' (temp 2-component vector of int)
-0:34          Function Call: textureSize(is2M1; (global 2-component vector of int)
+0:34          textureSize (global 2-component vector of int)
 0:34            'isms' (uniform isampler2DMS)
 0:35      Sequence
 0:35        move second child to first child (temp 2-component vector of int)
 0:35          't13' (temp 2-component vector of int)
-0:35          Function Call: textureSize(us2M1; (global 2-component vector of int)
+0:35          textureSize (global 2-component vector of int)
 0:35            'usms' (uniform usampler2DMS)
 0:36      Sequence
 0:36        move second child to first child (temp 3-component vector of int)
 0:36          't21' (temp 3-component vector of int)
-0:36          Function Call: textureSize(sA2M1; (global 3-component vector of int)
+0:36          textureSize (global 3-component vector of int)
 0:36            'smsa' (uniform sampler2DMSArray)
 0:37      Sequence
 0:37        move second child to first child (temp 3-component vector of int)
 0:37          't22' (temp 3-component vector of int)
-0:37          Function Call: textureSize(isA2M1; (global 3-component vector of int)
+0:37          textureSize (global 3-component vector of int)
 0:37            'ismsa' (uniform isampler2DMSArray)
 0:38      Sequence
 0:38        move second child to first child (temp 3-component vector of int)
 0:38          't23' (temp 3-component vector of int)
-0:38          Function Call: textureSize(usA2M1; (global 3-component vector of int)
+0:38          textureSize (global 3-component vector of int)
 0:38            'usmsa' (uniform usampler2DMSArray)
 0:39      Sequence
 0:39        move second child to first child (temp 4-component vector of float)
 0:39          't31' (temp 4-component vector of float)
-0:39          Function Call: texelFetch(s2M1;vi2;i1; (global 4-component vector of float)
+0:39          textureFetch (global 4-component vector of float)
 0:39            'sms' (uniform sampler2DMS)
 0:39            'p2' (flat in 2-component vector of int)
 0:39            'samp' (flat in int)
 0:40      Sequence
 0:40        move second child to first child (temp 4-component vector of int)
 0:40          't32' (temp 4-component vector of int)
-0:40          Function Call: texelFetch(is2M1;vi2;i1; (global 4-component vector of int)
+0:40          textureFetch (global 4-component vector of int)
 0:40            'isms' (uniform isampler2DMS)
 0:40            'p2' (flat in 2-component vector of int)
 0:40            'samp' (flat in int)
 0:41      Sequence
 0:41        move second child to first child (temp 4-component vector of uint)
 0:41          't33' (temp 4-component vector of uint)
-0:41          Function Call: texelFetch(us2M1;vi2;i1; (global 4-component vector of uint)
+0:41          textureFetch (global 4-component vector of uint)
 0:41            'usms' (uniform usampler2DMS)
 0:41            'p2' (flat in 2-component vector of int)
 0:41            Constant:
@@ -80,14 +80,14 @@ ERROR: node is still EOpNull!
 0:42      Sequence
 0:42        move second child to first child (temp 4-component vector of float)
 0:42          't41' (temp 4-component vector of float)
-0:42          Function Call: texelFetch(sA2M1;vi3;i1; (global 4-component vector of float)
+0:42          textureFetch (global 4-component vector of float)
 0:42            'smsa' (uniform sampler2DMSArray)
 0:42            'p3' (flat in 3-component vector of int)
 0:42            'samp' (flat in int)
 0:43      Sequence
 0:43        move second child to first child (temp 4-component vector of int)
 0:43          't42' (temp 4-component vector of int)
-0:43          Function Call: texelFetch(isA2M1;vi3;i1; (global 4-component vector of int)
+0:43          textureFetch (global 4-component vector of int)
 0:43            'ismsa' (uniform isampler2DMSArray)
 0:43            Constant:
 0:43              2 (const int)
@@ -97,7 +97,7 @@ ERROR: node is still EOpNull!
 0:44      Sequence
 0:44        move second child to first child (temp 4-component vector of uint)
 0:44          't43' (temp 4-component vector of uint)
-0:44          Function Call: texelFetch(usA2M1;vi3;i1; (global 4-component vector of uint)
+0:44          textureFetch (global 4-component vector of uint)
 0:44            'usmsa' (uniform usampler2DMSArray)
 0:44            'p3' (flat in 3-component vector of int)
 0:44            'samp' (flat in int)
@@ -143,51 +143,51 @@ ERROR: node is still EOpNull!
 0:33      Sequence
 0:33        move second child to first child (temp 2-component vector of int)
 0:33          't11' (temp 2-component vector of int)
-0:33          Function Call: textureSize(s2M1; (global 2-component vector of int)
+0:33          textureSize (global 2-component vector of int)
 0:33            'sms' (uniform sampler2DMS)
 0:34      Sequence
 0:34        move second child to first child (temp 2-component vector of int)
 0:34          't12' (temp 2-component vector of int)
-0:34          Function Call: textureSize(is2M1; (global 2-component vector of int)
+0:34          textureSize (global 2-component vector of int)
 0:34            'isms' (uniform isampler2DMS)
 0:35      Sequence
 0:35        move second child to first child (temp 2-component vector of int)
 0:35          't13' (temp 2-component vector of int)
-0:35          Function Call: textureSize(us2M1; (global 2-component vector of int)
+0:35          textureSize (global 2-component vector of int)
 0:35            'usms' (uniform usampler2DMS)
 0:36      Sequence
 0:36        move second child to first child (temp 3-component vector of int)
 0:36          't21' (temp 3-component vector of int)
-0:36          Function Call: textureSize(sA2M1; (global 3-component vector of int)
+0:36          textureSize (global 3-component vector of int)
 0:36            'smsa' (uniform sampler2DMSArray)
 0:37      Sequence
 0:37        move second child to first child (temp 3-component vector of int)
 0:37          't22' (temp 3-component vector of int)
-0:37          Function Call: textureSize(isA2M1; (global 3-component vector of int)
+0:37          textureSize (global 3-component vector of int)
 0:37            'ismsa' (uniform isampler2DMSArray)
 0:38      Sequence
 0:38        move second child to first child (temp 3-component vector of int)
 0:38          't23' (temp 3-component vector of int)
-0:38          Function Call: textureSize(usA2M1; (global 3-component vector of int)
+0:38          textureSize (global 3-component vector of int)
 0:38            'usmsa' (uniform usampler2DMSArray)
 0:39      Sequence
 0:39        move second child to first child (temp 4-component vector of float)
 0:39          't31' (temp 4-component vector of float)
-0:39          Function Call: texelFetch(s2M1;vi2;i1; (global 4-component vector of float)
+0:39          textureFetch (global 4-component vector of float)
 0:39            'sms' (uniform sampler2DMS)
 0:39            'p2' (flat in 2-component vector of int)
 0:39            'samp' (flat in int)
 0:40      Sequence
 0:40        move second child to first child (temp 4-component vector of int)
 0:40          't32' (temp 4-component vector of int)
-0:40          Function Call: texelFetch(is2M1;vi2;i1; (global 4-component vector of int)
+0:40          textureFetch (global 4-component vector of int)
 0:40            'isms' (uniform isampler2DMS)
 0:40            'p2' (flat in 2-component vector of int)
 0:40            'samp' (flat in int)
 0:41      Sequence
 0:41        move second child to first child (temp 4-component vector of uint)
 0:41          't33' (temp 4-component vector of uint)
-0:41          Function Call: texelFetch(us2M1;vi2;i1; (global 4-component vector of uint)
+0:41          textureFetch (global 4-component vector of uint)
 0:41            'usms' (uniform usampler2DMS)
 0:41            'p2' (flat in 2-component vector of int)
 0:41            Constant:
@@ -195,14 +195,14 @@ ERROR: node is still EOpNull!
 0:42      Sequence
 0:42        move second child to first child (temp 4-component vector of float)
 0:42          't41' (temp 4-component vector of float)
-0:42          Function Call: texelFetch(sA2M1;vi3;i1; (global 4-component vector of float)
+0:42          textureFetch (global 4-component vector of float)
 0:42            'smsa' (uniform sampler2DMSArray)
 0:42            'p3' (flat in 3-component vector of int)
 0:42            'samp' (flat in int)
 0:43      Sequence
 0:43        move second child to first child (temp 4-component vector of int)
 0:43          't42' (temp 4-component vector of int)
-0:43          Function Call: texelFetch(isA2M1;vi3;i1; (global 4-component vector of int)
+0:43          textureFetch (global 4-component vector of int)
 0:43            'ismsa' (uniform isampler2DMSArray)
 0:43            Constant:
 0:43              2 (const int)
@@ -212,7 +212,7 @@ ERROR: node is still EOpNull!
 0:44      Sequence
 0:44        move second child to first child (temp 4-component vector of uint)
 0:44          't43' (temp 4-component vector of uint)
-0:44          Function Call: texelFetch(usA2M1;vi3;i1; (global 4-component vector of uint)
+0:44          textureFetch (global 4-component vector of uint)
 0:44            'usmsa' (uniform usampler2DMSArray)
 0:44            'p3' (flat in 3-component vector of int)
 0:44            'samp' (flat in int)

--- a/Test/baseResults/300.frag.out
+++ b/Test/baseResults/300.frag.out
--- a/Test/baseResults/300.vert.out
+++ b/Test/baseResults/300.vert.out
@@ -173,7 +173,7 @@ ERROR: node is still EOpNull!
 0:120      Sequence
 0:120        move second child to first child (temp highp 2-component vector of int)
 0:120          'x1' (temp highp 2-component vector of int)
-0:120          Function Call: textureSize(s21;i1; (global highp 2-component vector of int)
+0:120          textureSize (global highp 2-component vector of int)
 0:120            's2D' (uniform lowp sampler2D)
 0:120            Constant:
 0:120              2 (const int)
@@ -182,7 +182,7 @@ ERROR: node is still EOpNull!
 0:122      Sequence
 0:122        move second child to first child (temp highp 3-component vector of int)
 0:122          'x3' (temp highp 3-component vector of int)
-0:122          Function Call: textureSize(sAS21;i1; (global highp 3-component vector of int)
+0:122          textureSize (global highp 3-component vector of int)
 0:122            's2DAS' (uniform lowp sampler2DArrayShadow)
 0:122            Constant:
 0:122              -1 (const int)
@@ -191,7 +191,7 @@ ERROR: node is still EOpNull!
 0:124      Sequence
 0:124        move second child to first child (temp highp 4-component vector of float)
 0:124          'x4' (temp highp 4-component vector of float)
-0:124          Function Call: texture(s21;vf2; (global highp 4-component vector of float)
+0:124          texture (global highp 4-component vector of float)
 0:124            's2D' (uniform lowp sampler2D)
 0:124            'c2D' (in highp 2-component vector of float)
 0:125      Constant:
@@ -199,7 +199,7 @@ ERROR: node is still EOpNull!
 0:126      Sequence
 0:126        move second child to first child (temp highp 4-component vector of float)
 0:126          'x5' (temp highp 4-component vector of float)
-0:126          Function Call: textureProjOffset(s31;vf4;vi3; (global highp 4-component vector of float)
+0:126          textureProjOffset (global highp 4-component vector of float)
 0:126            's3D' (uniform lowp sampler3D)
 0:126            Constant:
 0:126              0.200000
@@ -215,7 +215,7 @@ ERROR: node is still EOpNull!
 0:128      Sequence
 0:128        move second child to first child (temp highp float)
 0:128          'x6' (temp highp float)
-0:128          Function Call: textureProjGradOffset(sS21;vf4;vf2;vf2;vi2; (global highp float)
+0:128          textureProjGradOffset (global highp float)
 0:128            's2DS' (uniform lowp sampler2DShadow)
 0:128            'invIn' (invariant in highp 4-component vector of float)
 0:128            Constant:
@@ -432,7 +432,7 @@ ERROR: node is still EOpNull!
 0:120      Sequence
 0:120        move second child to first child (temp highp 2-component vector of int)
 0:120          'x1' (temp highp 2-component vector of int)
-0:120          Function Call: textureSize(s21;i1; (global highp 2-component vector of int)
+0:120          textureSize (global highp 2-component vector of int)
 0:120            's2D' (uniform lowp sampler2D)
 0:120            Constant:
 0:120              2 (const int)
@@ -441,7 +441,7 @@ ERROR: node is still EOpNull!
 0:122      Sequence
 0:122        move second child to first child (temp highp 3-component vector of int)
 0:122          'x3' (temp highp 3-component vector of int)
-0:122          Function Call: textureSize(sAS21;i1; (global highp 3-component vector of int)
+0:122          textureSize (global highp 3-component vector of int)
 0:122            's2DAS' (uniform lowp sampler2DArrayShadow)
 0:122            Constant:
 0:122              -1 (const int)
@@ -450,7 +450,7 @@ ERROR: node is still EOpNull!
 0:124      Sequence
 0:124        move second child to first child (temp highp 4-component vector of float)
 0:124          'x4' (temp highp 4-component vector of float)
-0:124          Function Call: texture(s21;vf2; (global highp 4-component vector of float)
+0:124          texture (global highp 4-component vector of float)
 0:124            's2D' (uniform lowp sampler2D)
 0:124            'c2D' (in highp 2-component vector of float)
 0:125      Constant:
@@ -458,7 +458,7 @@ ERROR: node is still EOpNull!
 0:126      Sequence
 0:126        move second child to first child (temp highp 4-component vector of float)
 0:126          'x5' (temp highp 4-component vector of float)
-0:126          Function Call: textureProjOffset(s31;vf4;vi3; (global highp 4-component vector of float)
+0:126          textureProjOffset (global highp 4-component vector of float)
 0:126            's3D' (uniform lowp sampler3D)
 0:126            Constant:
 0:126              0.200000
@@ -474,7 +474,7 @@ ERROR: node is still EOpNull!
 0:128      Sequence
 0:128        move second child to first child (temp highp float)
 0:128          'x6' (temp highp float)
-0:128          Function Call: textureProjGradOffset(sS21;vf4;vf2;vf2;vi2; (global highp float)
+0:128          textureProjGradOffset (global highp float)
 0:128            's2DS' (uniform lowp sampler2DShadow)
 0:128            'invIn' (invariant in highp 4-component vector of float)
 0:128            Constant:

--- a/Test/baseResults/300block.frag.out
+++ b/Test/baseResults/300block.frag.out
@@ -23,18 +23,18 @@ ERROR: node is still EOpNull!
 0:42  Function Definition: main( (global void)
 0:42    Function Parameters: 
 0:44    Sequence
-0:44      Function Call: texture(is31;vf3; (global mediump 4-component vector of int)
+0:44      texture (global mediump 4-component vector of int)
 0:44        sampler: direct index for structure (global lowp isampler3D)
 0:44          's' (uniform structure{global mediump 4-component vector of float u, global mediump 4-component vector of uint v, global lowp isampler3D sampler, global mediump 3-component vector of float w, global structure{global mediump int a} t})
 0:44          Constant:
 0:44            2 (const int)
-0:44        Construct vec3 (temp 3-component vector of float)
+0:44        Construct vec3 (temp mediump 3-component vector of float)
-0:44          Convert int to float (temp float)
+0:44          Convert int to float (temp mediump float)
 0:44            ni: direct index for structure (layout(column_major shared ) uniform mediump int)
 0:44              'inst' (layout(column_major shared ) uniform block{layout(column_major shared ) uniform mediump 4-component vector of uint nbv, layout(column_major shared ) uniform mediump int ni})
 0:44              Constant:
 0:44                1 (const int)
-0:44          Convert uint to float (temp float)
+0:44          Convert uint to float (temp mediump float)
 0:44            direct index (temp mediump uint)
 0:44              bv: direct index for structure (layout(column_major shared ) uniform mediump 4-component vector of uint)
 0:44                'anon@0' (layout(column_major shared ) uniform block{layout(column_major shared ) uniform mediump 4-component vector of uint bv, layout(column_major shared ) uniform mediump 2X2 matrix of float bm2, layout(column_major shared ) uniform lowp isampler2D sampler, layout(column_major shared ) uniform structure{global mediump int a} t, layout(column_major shared ) uniform structure{global mediump 4-component vector of float u, global mediump 4-component vector of uint v, global lowp isampler3D sampler, global mediump 3-component vector of float w, global structure{global mediump int a} t} fbs})
@@ -42,7 +42,7 @@ ERROR: node is still EOpNull!
 0:44                  0 (const uint)
 0:44              Constant:
 0:44                1 (const int)
-0:44          Convert uint to float (temp float)
+0:44          Convert uint to float (temp mediump float)
 0:44            direct index (temp mediump uint)
 0:44              nbv: direct index for structure (layout(column_major shared ) uniform mediump 4-component vector of uint)
 0:44                direct index (layout(column_major shared ) temp block{layout(column_major shared ) uniform mediump 4-component vector of uint nbv, layout(column_major shared ) uniform mediump int ni})
@@ -91,18 +91,18 @@ ERROR: node is still EOpNull!
 0:42  Function Definition: main( (global void)
 0:42    Function Parameters: 
 0:44    Sequence
-0:44      Function Call: texture(is31;vf3; (global mediump 4-component vector of int)
+0:44      texture (global mediump 4-component vector of int)
 0:44        sampler: direct index for structure (global lowp isampler3D)
 0:44          's' (uniform structure{global mediump 4-component vector of float u, global mediump 4-component vector of uint v, global lowp isampler3D sampler, global mediump 3-component vector of float w, global structure{global mediump int a} t})
 0:44          Constant:
 0:44            2 (const int)
-0:44        Construct vec3 (temp 3-component vector of float)
+0:44        Construct vec3 (temp mediump 3-component vector of float)
-0:44          Convert int to float (temp float)
+0:44          Convert int to float (temp mediump float)
 0:44            ni: direct index for structure (layout(column_major shared ) uniform mediump int)
 0:44              'inst' (layout(column_major shared ) uniform block{layout(column_major shared ) uniform mediump 4-component vector of uint nbv, layout(column_major shared ) uniform mediump int ni})
 0:44              Constant:
 0:44                1 (const int)
-0:44          Convert uint to float (temp float)
+0:44          Convert uint to float (temp mediump float)
 0:44            direct index (temp mediump uint)
 0:44              bv: direct index for structure (layout(column_major shared ) uniform mediump 4-component vector of uint)
 0:44                'anon@0' (layout(column_major shared ) uniform block{layout(column_major shared ) uniform mediump 4-component vector of uint bv, layout(column_major shared ) uniform mediump 2X2 matrix of float bm2, layout(column_major shared ) uniform lowp isampler2D sampler, layout(column_major shared ) uniform structure{global mediump int a} t, layout(column_major shared ) uniform structure{global mediump 4-component vector of float u, global mediump 4-component vector of uint v, global lowp isampler3D sampler, global mediump 3-component vector of float w, global structure{global mediump int a} t} fbs})
@@ -110,7 +110,7 @@ ERROR: node is still EOpNull!
 0:44                  0 (const uint)
 0:44              Constant:
 0:44                1 (const int)
-0:44          Convert uint to float (temp float)
+0:44          Convert uint to float (temp mediump float)
 0:44            direct index (temp mediump uint)
 0:44              nbv: direct index for structure (layout(column_major shared ) uniform mediump 4-component vector of uint)
 0:44                direct index (layout(column_major shared ) temp block{layout(column_major shared ) uniform mediump 4-component vector of uint nbv, layout(column_major shared ) uniform mediump int ni})

--- a/Test/baseResults/310.comp.out
+++ b/Test/baseResults/310.comp.out
@@ -134,23 +134,23 @@ ERROR: node is still EOpNull!
 0:86          'i' (temp highp int)
 0:86          Constant:
 0:86            4 (const int)
-0:87      Function Call: imageAtomicCompSwap(iI21;vi2;i1;i1; (global highp int)
+0:87      imageAtomicCompSwap (global highp int)
 0:87        'iimg2D' (layout(r32i ) uniform highp iimage2D)
-0:87        Construct ivec2 (temp 2-component vector of int)
+0:87        Construct ivec2 (temp highp 2-component vector of int)
 0:87          'i' (temp highp int)
 0:87          'i' (temp highp int)
 0:87        'i' (temp highp int)
 0:87        'i' (temp highp int)
-0:88      Function Call: imageAtomicAdd(uI21;vi2;u1; (global highp uint)
+0:88      imageAtomicAdd (global highp uint)
 0:88        'uimg2D' (layout(r32ui ) uniform highp uimage2D)
-0:88        Construct ivec2 (temp 2-component vector of int)
+0:88        Construct ivec2 (temp highp 2-component vector of int)
 0:88          'i' (temp highp int)
 0:88          'i' (temp highp int)
-0:88        Convert int to uint (temp uint)
+0:88        Convert int to uint (temp highp uint)
 0:88          'i' (temp highp int)
-0:89      Function Call: imageAtomicMin(iI21;vi2;i1; (global highp int)
+0:89      imageAtomicMin (global highp int)
 0:89        'iimg2Drgba' (layout(rgba32i ) readonly uniform highp iimage2D)
-0:89        Construct ivec2 (temp 2-component vector of int)
+0:89        Construct ivec2 (temp highp 2-component vector of int)
 0:89          'i' (temp highp int)
 0:89          'i' (temp highp int)
 0:89        'i' (temp highp int)
@@ -159,12 +159,12 @@ ERROR: node is still EOpNull!
 0:91      Sequence
 0:91        move second child to first child (temp highp 4-component vector of int)
 0:91          'pos' (temp highp 4-component vector of int)
-0:91          Function Call: imageLoad(iI21;vi2; (global highp 4-component vector of int)
+0:91          imageLoad (global highp 4-component vector of int)
 0:91            'iimg2D' (layout(r32i ) uniform highp iimage2D)
-0:91            Construct ivec2 (temp 2-component vector of int)
+0:91            Construct ivec2 (temp highp 2-component vector of int)
 0:91              'i' (temp highp int)
 0:91              'i' (temp highp int)
-0:92      Function Call: imageStore(iIA21;vi3;vi4; (global highp void)
+0:92      imageStore (global highp void)
 0:92        'ii2da' (writeonly uniform highp iimage2DArray)
 0:92        Construct ivec3 (temp 3-component vector of int)
 0:92          'i' (temp highp int)
@@ -175,14 +175,14 @@ ERROR: node is still EOpNull!
 0:92          0 (const int)
 0:92          0 (const int)
 0:92          0 (const int)
-0:93      Function Call: imageLoad(I21;vi2; (global highp 4-component vector of float)
+0:93      imageLoad (global highp 4-component vector of float)
 0:93        'img2Drgba' (layout(rgba32f ) readonly uniform lowp image2D)
-0:93        Construct ivec2 (temp 2-component vector of int)
+0:93        Construct ivec2 (temp highp 2-component vector of int)
 0:93          'i' (temp highp int)
 0:93          'i' (temp highp int)
-0:94      Function Call: imageLoad(iIA21;vi3; (global highp 4-component vector of int)
+0:94      imageLoad (global highp 4-component vector of int)
 0:94        'ii2da' (writeonly uniform highp iimage2DArray)
-0:94        Construct ivec3 (temp 3-component vector of int)
+0:94        Construct ivec3 (temp highp 3-component vector of int)
 0:94          'i' (temp highp int)
 0:94          'i' (temp highp int)
 0:94          'i' (temp highp int)
@@ -560,23 +560,23 @@ ERROR: node is still EOpNull!
 0:86          'i' (temp highp int)
 0:86          Constant:
 0:86            4 (const int)
-0:87      Function Call: imageAtomicCompSwap(iI21;vi2;i1;i1; (global highp int)
+0:87      imageAtomicCompSwap (global highp int)
 0:87        'iimg2D' (layout(r32i ) uniform highp iimage2D)
-0:87        Construct ivec2 (temp 2-component vector of int)
+0:87        Construct ivec2 (temp highp 2-component vector of int)
 0:87          'i' (temp highp int)
 0:87          'i' (temp highp int)
 0:87        'i' (temp highp int)
 0:87        'i' (temp highp int)
-0:88      Function Call: imageAtomicAdd(uI21;vi2;u1; (global highp uint)
+0:88      imageAtomicAdd (global highp uint)
 0:88        'uimg2D' (layout(r32ui ) uniform highp uimage2D)
-0:88        Construct ivec2 (temp 2-component vector of int)
+0:88        Construct ivec2 (temp highp 2-component vector of int)
 0:88          'i' (temp highp int)
 0:88          'i' (temp highp int)
-0:88        Convert int to uint (temp uint)
+0:88        Convert int to uint (temp highp uint)
 0:88          'i' (temp highp int)
-0:89      Function Call: imageAtomicMin(iI21;vi2;i1; (global highp int)
+0:89      imageAtomicMin (global highp int)
 0:89        'iimg2Drgba' (layout(rgba32i ) readonly uniform highp iimage2D)
-0:89        Construct ivec2 (temp 2-component vector of int)
+0:89        Construct ivec2 (temp highp 2-component vector of int)
 0:89          'i' (temp highp int)
 0:89          'i' (temp highp int)
 0:89        'i' (temp highp int)
@@ -585,12 +585,12 @@ ERROR: node is still EOpNull!
 0:91      Sequence
 0:91        move second child to first child (temp highp 4-component vector of int)
 0:91          'pos' (temp highp 4-component vector of int)
-0:91          Function Call: imageLoad(iI21;vi2; (global highp 4-component vector of int)
+0:91          imageLoad (global highp 4-component vector of int)
 0:91            'iimg2D' (layout(r32i ) uniform highp iimage2D)
-0:91            Construct ivec2 (temp 2-component vector of int)
+0:91            Construct ivec2 (temp highp 2-component vector of int)
 0:91              'i' (temp highp int)
 0:91              'i' (temp highp int)
-0:92      Function Call: imageStore(iIA21;vi3;vi4; (global highp void)
+0:92      imageStore (global highp void)
 0:92        'ii2da' (writeonly uniform highp iimage2DArray)
 0:92        Construct ivec3 (temp 3-component vector of int)
 0:92          'i' (temp highp int)
@@ -601,14 +601,14 @@ ERROR: node is still EOpNull!
 0:92          0 (const int)
 0:92          0 (const int)
 0:92          0 (const int)
-0:93      Function Call: imageLoad(I21;vi2; (global highp 4-component vector of float)
+0:93      imageLoad (global highp 4-component vector of float)
 0:93        'img2Drgba' (layout(rgba32f ) readonly uniform lowp image2D)
-0:93        Construct ivec2 (temp 2-component vector of int)
+0:93        Construct ivec2 (temp highp 2-component vector of int)
 0:93          'i' (temp highp int)
 0:93          'i' (temp highp int)
-0:94      Function Call: imageLoad(iIA21;vi3; (global highp 4-component vector of int)
+0:94      imageLoad (global highp 4-component vector of int)
 0:94        'ii2da' (writeonly uniform highp iimage2DArray)
-0:94        Construct ivec3 (temp 3-component vector of int)
+0:94        Construct ivec3 (temp highp 3-component vector of int)
 0:94          'i' (temp highp int)
 0:94          'i' (temp highp int)
 0:94          'i' (temp highp int)

--- a/Test/baseResults/310.frag.out
+++ b/Test/baseResults/310.frag.out
--- a/Test/baseResults/310.vert.out
+++ b/Test/baseResults/310.vert.out
--- a/Test/baseResults/400.frag.out
+++ b/Test/baseResults/400.frag.out
--- a/Test/baseResults/420.geom.out
+++ b/Test/baseResults/420.geom.out
@@ -52,7 +52,7 @@ ERROR: node is still EOpNull!
 0:40      Sequence
 0:40        move second child to first child (temp 4-component vector of float)
 0:40          'v' (temp 4-component vector of float)
-0:40          Function Call: textureGatherOffset(s21;vf2;vi2; (global 4-component vector of float)
+0:40          textureGatherOffset (global 4-component vector of float)
 0:40            's2D' (uniform sampler2D)
 0:40            direct index (temp 2-component vector of float)
 0:40              'coord' (in 3-element array of 2-component vector of float)
@@ -179,7 +179,7 @@ ERROR: node is still EOpNull!
 0:40      Sequence
 0:40        move second child to first child (temp 4-component vector of float)
 0:40          'v' (temp 4-component vector of float)
-0:40          Function Call: textureGatherOffset(s21;vf2;vi2; (global 4-component vector of float)
+0:40          textureGatherOffset (global 4-component vector of float)
 0:40            's2D' (uniform sampler2D)
 0:40            direct index (temp 2-component vector of float)
 0:40              'coord' (in 3-element array of 2-component vector of float)

--- a/Test/baseResults/420.vert.out
+++ b/Test/baseResults/420.vert.out
@@ -171,21 +171,21 @@ ERROR: node is still EOpNull!
 0:111            'anon@0' (layout(binding=7 column_major shared ) uniform block{layout(column_major shared ) uniform int aoeu})
 0:111            Constant:
 0:111              0 (const uint)
-0:112      Function Call: imageAtomicCompSwap(iI21;vi2;i1;i1; (global int)
+0:112      imageAtomicCompSwap (global int)
 0:112        'iimg2D' (layout(r32i ) uniform iimage2D)
 0:112        Construct ivec2 (temp 2-component vector of int)
 0:112          'i' (temp int)
 0:112          'i' (temp int)
 0:112        'i' (temp int)
 0:112        'i' (temp int)
-0:113      Function Call: imageAtomicAdd(uI21;vi2;u1; (global uint)
+0:113      imageAtomicAdd (global uint)
 0:113        'uimg2D' (layout(r32ui ) uniform uimage2D)
 0:113        Construct ivec2 (temp 2-component vector of int)
 0:113          'i' (temp int)
 0:113          'i' (temp int)
 0:113        Convert int to uint (temp uint)
 0:113          'i' (temp int)
-0:114      Function Call: imageAtomicMin(iI21;vi2;i1; (global int)
+0:114      imageAtomicMin (global int)
 0:114        'iimg2Drgba' (layout(rgba32i ) uniform iimage2D)
 0:114        Construct ivec2 (temp 2-component vector of int)
 0:114          'i' (temp int)
@@ -196,7 +196,7 @@ ERROR: node is still EOpNull!
 0:116      Sequence
 0:116        move second child to first child (temp 4-component vector of int)
 0:116          'pos' (temp 4-component vector of int)
-0:116          Function Call: imageLoad(iI21;vi2; (global 4-component vector of int)
+0:116          imageLoad (global 4-component vector of int)
 0:116            'iimg2D' (layout(r32i ) uniform iimage2D)
 0:116            Construct ivec2 (temp 2-component vector of int)
 0:116              'i' (temp int)
@@ -204,13 +204,13 @@ ERROR: node is still EOpNull!
 0:117      Sequence
 0:117        move second child to first child (temp 4-component vector of float)
 0:117          'col' (temp 4-component vector of float)
-0:117          Function Call: imageLoad(I2M1;vi2;i1; (global 4-component vector of float)
+0:117          imageLoad (global 4-component vector of float)
 0:117            'img2DMS' (uniform image2DMS)
 0:117            Construct ivec2 (temp 2-component vector of int)
 0:117              'i' (temp int)
 0:117              'i' (temp int)
 0:117            'i' (temp int)
-0:118      Function Call: imageStore(I2M1;vi2;i1;vf4; (global void)
+0:118      imageStore (global void)
 0:118        'img2DMSWO' (writeonly uniform image2DMS)
 0:118        Construct ivec2 (temp 2-component vector of int)
 0:118          'i' (temp int)
@@ -221,7 +221,7 @@ ERROR: node is still EOpNull!
 0:118          0.000000
 0:118          0.000000
 0:118          0.000000
-0:119      Function Call: imageLoad(I2M1;vi2;i1; (global 4-component vector of float)
+0:119      imageLoad (global 4-component vector of float)
 0:119        'img2DMSWO' (writeonly uniform image2DMS)
 0:119        Construct ivec2 (temp 2-component vector of int)
 0:119          'i' (temp int)
@@ -416,21 +416,21 @@ ERROR: node is still EOpNull!
 0:111            'anon@0' (layout(binding=7 column_major shared ) uniform block{layout(column_major shared ) uniform int aoeu})
 0:111            Constant:
 0:111              0 (const uint)
-0:112      Function Call: imageAtomicCompSwap(iI21;vi2;i1;i1; (global int)
+0:112      imageAtomicCompSwap (global int)
 0:112        'iimg2D' (layout(r32i ) uniform iimage2D)
 0:112        Construct ivec2 (temp 2-component vector of int)
 0:112          'i' (temp int)
 0:112          'i' (temp int)
 0:112        'i' (temp int)
 0:112        'i' (temp int)
-0:113      Function Call: imageAtomicAdd(uI21;vi2;u1; (global uint)
+0:113      imageAtomicAdd (global uint)
 0:113        'uimg2D' (layout(r32ui ) uniform uimage2D)
 0:113        Construct ivec2 (temp 2-component vector of int)
 0:113          'i' (temp int)
 0:113          'i' (temp int)
 0:113        Convert int to uint (temp uint)
 0:113          'i' (temp int)
-0:114      Function Call: imageAtomicMin(iI21;vi2;i1; (global int)
+0:114      imageAtomicMin (global int)
 0:114        'iimg2Drgba' (layout(rgba32i ) uniform iimage2D)
 0:114        Construct ivec2 (temp 2-component vector of int)
 0:114          'i' (temp int)
@@ -441,7 +441,7 @@ ERROR: node is still EOpNull!
 0:116      Sequence
 0:116        move second child to first child (temp 4-component vector of int)
 0:116          'pos' (temp 4-component vector of int)
-0:116          Function Call: imageLoad(iI21;vi2; (global 4-component vector of int)
+0:116          imageLoad (global 4-component vector of int)
 0:116            'iimg2D' (layout(r32i ) uniform iimage2D)
 0:116            Construct ivec2 (temp 2-component vector of int)
 0:116              'i' (temp int)
@@ -449,13 +449,13 @@ ERROR: node is still EOpNull!
 0:117      Sequence
 0:117        move second child to first child (temp 4-component vector of float)
 0:117          'col' (temp 4-component vector of float)
-0:117          Function Call: imageLoad(I2M1;vi2;i1; (global 4-component vector of float)
+0:117          imageLoad (global 4-component vector of float)
 0:117            'img2DMS' (uniform image2DMS)
 0:117            Construct ivec2 (temp 2-component vector of int)
 0:117              'i' (temp int)
 0:117              'i' (temp int)
 0:117            'i' (temp int)
-0:118      Function Call: imageStore(I2M1;vi2;i1;vf4; (global void)
+0:118      imageStore (global void)
 0:118        'img2DMSWO' (writeonly uniform image2DMS)
 0:118        Construct ivec2 (temp 2-component vector of int)
 0:118          'i' (temp int)
@@ -466,7 +466,7 @@ ERROR: node is still EOpNull!
 0:118          0.000000
 0:118          0.000000
 0:118          0.000000
-0:119      Function Call: imageLoad(I2M1;vi2;i1; (global 4-component vector of float)
+0:119      imageLoad (global 4-component vector of float)
 0:119        'img2DMSWO' (writeonly uniform image2DMS)
 0:119        Construct ivec2 (temp 2-component vector of int)
 0:119          'i' (temp int)

--- a/Test/baseResults/430.vert.out
+++ b/Test/baseResults/430.vert.out
@@ -105,19 +105,19 @@ ERROR: node is still EOpNull!
 0:168      Sequence
 0:168        move second child to first child (temp int)
 0:168          's' (temp int)
-0:168          Function Call: textureSamples(s2M1; (global int)
+0:168          textureSamples (global int)
 0:168            's2dms' (uniform sampler2DMS)
 0:169      add second child into first child (temp int)
 0:169        's' (temp int)
-0:169        Function Call: textureSamples(usA2M1; (global int)
+0:169        textureSamples (global int)
 0:169          'us2dmsa' (uniform usampler2DMSArray)
 0:170      add second child into first child (temp int)
 0:170        's' (temp int)
-0:170        Function Call: imageSamples(iI2M1; (global int)
+0:170        imageQuerySamples (global int)
 0:170          'ii2dms' (layout(rgba32i ) uniform iimage2DMS)
 0:171      add second child into first child (temp int)
 0:171        's' (temp int)
-0:171        Function Call: imageSamples(IA2M1; (global int)
+0:171        imageQuerySamples (global int)
 0:171          'i2dmsa' (layout(rgba32f ) uniform image2DMSArray)
 0:176  Function Definition: fooq2( (global void)
 0:176    Function Parameters: 
@@ -125,19 +125,19 @@ ERROR: node is still EOpNull!
 0:178      Sequence
 0:178        move second child to first child (temp int)
 0:178          's' (temp int)
-0:178          Function Call: textureSamples(s2M1; (global int)
+0:178          textureSamples (global int)
 0:178            's2dms' (uniform sampler2DMS)
 0:179      add second child into first child (temp int)
 0:179        's' (temp int)
-0:179        Function Call: textureSamples(usA2M1; (global int)
+0:179        textureSamples (global int)
 0:179          'us2dmsa' (uniform usampler2DMSArray)
 0:180      add second child into first child (temp int)
 0:180        's' (temp int)
-0:180        Function Call: imageSamples(iI2M1; (global int)
+0:180        imageQuerySamples (global int)
 0:180          'ii2dms' (layout(rgba32i ) uniform iimage2DMS)
 0:181      add second child into first child (temp int)
 0:181        's' (temp int)
-0:181        Function Call: imageSamples(IA2M1; (global int)
+0:181        imageQuerySamples (global int)
 0:181          'i2dmsa' (layout(rgba32f ) uniform image2DMSArray)
 0:?   Linker Objects
 0:?     'v4' (layout(location=3 ) temp 4-component vector of float)
@@ -237,19 +237,19 @@ ERROR: node is still EOpNull!
 0:168      Sequence
 0:168        move second child to first child (temp int)
 0:168          's' (temp int)
-0:168          Function Call: textureSamples(s2M1; (global int)
+0:168          textureSamples (global int)
 0:168            's2dms' (uniform sampler2DMS)
 0:169      add second child into first child (temp int)
 0:169        's' (temp int)
-0:169        Function Call: textureSamples(usA2M1; (global int)
+0:169        textureSamples (global int)
 0:169          'us2dmsa' (uniform usampler2DMSArray)
 0:170      add second child into first child (temp int)
 0:170        's' (temp int)
-0:170        Function Call: imageSamples(iI2M1; (global int)
+0:170        imageQuerySamples (global int)
 0:170          'ii2dms' (layout(rgba32i ) uniform iimage2DMS)
 0:171      add second child into first child (temp int)
 0:171        's' (temp int)
-0:171        Function Call: imageSamples(IA2M1; (global int)
+0:171        imageQuerySamples (global int)
 0:171          'i2dmsa' (layout(rgba32f ) uniform image2DMSArray)
 0:176  Function Definition: fooq2( (global void)
 0:176    Function Parameters: 
@@ -257,19 +257,19 @@ ERROR: node is still EOpNull!
 0:178      Sequence
 0:178        move second child to first child (temp int)
 0:178          's' (temp int)
-0:178          Function Call: textureSamples(s2M1; (global int)
+0:178          textureSamples (global int)
 0:178            's2dms' (uniform sampler2DMS)
 0:179      add second child into first child (temp int)
 0:179        's' (temp int)
-0:179        Function Call: textureSamples(usA2M1; (global int)
+0:179        textureSamples (global int)
 0:179          'us2dmsa' (uniform usampler2DMSArray)
 0:180      add second child into first child (temp int)
 0:180        's' (temp int)
-0:180        Function Call: imageSamples(iI2M1; (global int)
+0:180        imageQuerySamples (global int)
 0:180          'ii2dms' (layout(rgba32i ) uniform iimage2DMS)
 0:181      add second child into first child (temp int)
 0:181        's' (temp int)
-0:181        Function Call: imageSamples(IA2M1; (global int)
+0:181        imageQuerySamples (global int)
 0:181          'i2dmsa' (layout(rgba32f ) uniform image2DMSArray)
 0:?   Linker Objects
 0:?     'v4' (layout(location=3 ) temp 4-component vector of float)

--- a/Test/baseResults/450.frag.out
+++ b/Test/baseResults/450.frag.out
@@ -105,24 +105,24 @@ Shader version: 450
 0:44      Sequence
 0:44        move second child to first child (temp int)
 0:44          's' (temp int)
-0:44          Function Call: textureSamples(s2M1; (global int)
+0:44          textureSamples (global int)
 0:44            's2dms' (uniform sampler2DMS)
 0:45      add second child into first child (temp int)
 0:45        's' (temp int)
-0:45        Function Call: textureSamples(usA2M1; (global int)
+0:45        textureSamples (global int)
 0:45          'us2dmsa' (uniform usampler2DMSArray)
 0:46      add second child into first child (temp int)
 0:46        's' (temp int)
-0:46        Function Call: imageSamples(iI2M1; (global int)
+0:46        imageQuerySamples (global int)
 0:46          'ii2dms' (layout(rgba32i ) uniform iimage2DMS)
 0:47      add second child into first child (temp int)
 0:47        's' (temp int)
-0:47        Function Call: imageSamples(IA2M1; (global int)
+0:47        imageQuerySamples (global int)
 0:47          'i2dmsa' (layout(rgba32f ) uniform image2DMSArray)
 0:48      Sequence
 0:48        move second child to first child (temp float)
 0:48          'f' (temp float)
-0:48          Function Call: imageAtomicExchange(IA2M1;vi3;i1;f1; (global float)
+0:48          imageAtomicExchange (global float)
 0:48            'i2dmsa' (layout(rgba32f ) uniform image2DMSArray)
 0:48            Convert float to int (temp 3-component vector of int)
 0:48              'in3' (smooth in 3-component vector of float)
@@ -249,24 +249,24 @@ Shader version: 450
 0:44      Sequence
 0:44        move second child to first child (temp int)
 0:44          's' (temp int)
-0:44          Function Call: textureSamples(s2M1; (global int)
+0:44          textureSamples (global int)
 0:44            's2dms' (uniform sampler2DMS)
 0:45      add second child into first child (temp int)
 0:45        's' (temp int)
-0:45        Function Call: textureSamples(usA2M1; (global int)
+0:45        textureSamples (global int)
 0:45          'us2dmsa' (uniform usampler2DMSArray)
 0:46      add second child into first child (temp int)
 0:46        's' (temp int)
-0:46        Function Call: imageSamples(iI2M1; (global int)
+0:46        imageQuerySamples (global int)
 0:46          'ii2dms' (layout(rgba32i ) uniform iimage2DMS)
 0:47      add second child into first child (temp int)
 0:47        's' (temp int)
-0:47        Function Call: imageSamples(IA2M1; (global int)
+0:47        imageQuerySamples (global int)
 0:47          'i2dmsa' (layout(rgba32f ) uniform image2DMSArray)
 0:48      Sequence
 0:48        move second child to first child (temp float)
 0:48          'f' (temp float)
-0:48          Function Call: imageAtomicExchange(IA2M1;vi3;i1;f1; (global float)
+0:48          imageAtomicExchange (global float)
 0:48            'i2dmsa' (layout(rgba32f ) uniform image2DMSArray)
 0:48            Convert float to int (temp 3-component vector of int)
 0:48              'in3' (smooth in 3-component vector of float)

--- a/Test/baseResults/aggOps.frag.out
+++ b/Test/baseResults/aggOps.frag.out
@@ -67,13 +67,13 @@ Shader version: 130
 0:30        true case
 0:31        move second child to first child (temp 4-component vector of float)
 0:31          'v' (temp 4-component vector of float)
-0:31          Function Call: texture2D(s21;vf2; (global 4-component vector of float)
+0:31          texture (global 4-component vector of float)
 0:31            'sampler' (uniform sampler2D)
 0:31            'coord' (smooth in 2-component vector of float)
 0:30        false case
 0:33        move second child to first child (temp 4-component vector of float)
 0:33          'v' (temp 4-component vector of float)
-0:33          Function Call: texture2D(s21;vf2; (global 4-component vector of float)
+0:33          texture (global 4-component vector of float)
 0:33            'sampler' (uniform sampler2D)
 0:33            vector-scale (temp 2-component vector of float)
 0:33              Constant:
@@ -216,13 +216,13 @@ Shader version: 130
 0:30        true case
 0:31        move second child to first child (temp 4-component vector of float)
 0:31          'v' (temp 4-component vector of float)
-0:31          Function Call: texture2D(s21;vf2; (global 4-component vector of float)
+0:31          texture (global 4-component vector of float)
 0:31            'sampler' (uniform sampler2D)
 0:31            'coord' (smooth in 2-component vector of float)
 0:30        false case
 0:33        move second child to first child (temp 4-component vector of float)
 0:33          'v' (temp 4-component vector of float)
-0:33          Function Call: texture2D(s21;vf2; (global 4-component vector of float)
+0:33          texture (global 4-component vector of float)
 0:33            'sampler' (uniform sampler2D)
 0:33            vector-scale (temp 2-component vector of float)
 0:33              Constant:

--- a/Test/baseResults/conditionalDiscard.frag.out
+++ b/Test/baseResults/conditionalDiscard.frag.out
@@ -7,7 +7,7 @@ Shader version: 110
 0:8      Sequence
 0:8        move second child to first child (temp 4-component vector of float)
 0:8          'v' (temp 4-component vector of float)
-0:8          Function Call: texture2D(s21;vf2; (global 4-component vector of float)
+0:8          texture (global 4-component vector of float)
 0:8            'tex' (uniform sampler2D)
 0:8            'coord' (smooth in 2-component vector of float)
 0:10      Test condition and select (temp void)
@@ -40,7 +40,7 @@ Shader version: 110
 0:8      Sequence
 0:8        move second child to first child (temp 4-component vector of float)
 0:8          'v' (temp 4-component vector of float)
-0:8          Function Call: texture2D(s21;vf2; (global 4-component vector of float)
+0:8          texture (global 4-component vector of float)
 0:8            'tex' (uniform sampler2D)
 0:8            'coord' (smooth in 2-component vector of float)
 0:10      Test condition and select (temp void)

--- a/Test/baseResults/deepRvalue.frag.out
+++ b/Test/baseResults/deepRvalue.frag.out
@@ -81,7 +81,7 @@ Shader version: 120
 0:28        move second child to first child (temp float)
 0:28          'i' (temp float)
 0:28          direct index (temp float)
-0:28            Function Call: texture2D(s21;vf2; (global 4-component vector of float)
+0:28            texture (global 4-component vector of float)
 0:28              'sampler' (uniform sampler2D)
 0:28              Constant:
 0:28                0.500000
@@ -225,7 +225,7 @@ Shader version: 120
 0:28        move second child to first child (temp float)
 0:28          'i' (temp float)
 0:28          direct index (temp float)
-0:28            Function Call: texture2D(s21;vf2; (global 4-component vector of float)
+0:28            texture (global 4-component vector of float)
 0:28              'sampler' (uniform sampler2D)
 0:28              Constant:
 0:28                0.500000

--- a/Test/baseResults/localAggregates.frag.out
+++ b/Test/baseResults/localAggregates.frag.out
@@ -192,7 +192,7 @@ Shader version: 130
 0:71              indirect index (temp float)
 0:71                'a' (temp 16-element array of float)
 0:71                'x' (temp int)
-0:71          Function Call: texture2D(s21;vf2; (global 4-component vector of float)
+0:71          texture (global 4-component vector of float)
 0:71            'sampler' (uniform sampler2D)
 0:71            'coord' (smooth in 2-component vector of float)
 0:?   Linker Objects
@@ -399,7 +399,7 @@ Shader version: 130
 0:71              indirect index (temp float)
 0:71                'a' (temp 16-element array of float)
 0:71                'x' (temp int)
-0:71          Function Call: texture2D(s21;vf2; (global 4-component vector of float)
+0:71          texture (global 4-component vector of float)
 0:71            'sampler' (uniform sampler2D)
 0:71            'coord' (smooth in 2-component vector of float)
 0:?   Linker Objects

--- a/Test/baseResults/newTexture.frag.out
+++ b/Test/baseResults/newTexture.frag.out
--- a/Test/baseResults/pointCoord.frag.out
+++ b/Test/baseResults/pointCoord.frag.out
@@ -14,7 +14,7 @@ Shader version: 100
 0:9        true case
 0:10        move second child to first child (temp highp 4-component vector of float)
 0:10          'color' (temp highp 4-component vector of float)
-0:10          Function Call: texture2D(s21;vf2; (global lowp 4-component vector of float)
+0:10          texture (global lowp 4-component vector of float)
 0:10            'sampler' (uniform lowp sampler2D)
 0:10            'gl_PointCoord' (gl_PointCoord mediump 2-component vector of float PointCoord)
 0:9        false case
@@ -50,7 +50,7 @@ Shader version: 100
 0:9        true case
 0:10        move second child to first child (temp highp 4-component vector of float)
 0:10          'color' (temp highp 4-component vector of float)
-0:10          Function Call: texture2D(s21;vf2; (global lowp 4-component vector of float)
+0:10          texture (global lowp 4-component vector of float)
 0:10            'sampler' (uniform lowp sampler2D)
 0:10            'gl_PointCoord' (gl_PointCoord mediump 2-component vector of float PointCoord)
 0:9        false case

--- a/Test/baseResults/precision.frag.out
+++ b/Test/baseResults/precision.frag.out
@@ -99,17 +99,17 @@ ERROR: node is still EOpNull!
 0:65                  'level1_high' (temp highp int)
 0:65            Constant:
 0:65              0 (const int)
-0:67      Function Call: texture2D(s21;vf2; (global lowp 4-component vector of float)
+0:67      texture (global lowp 4-component vector of float)
 0:67        'samplerLow' (uniform lowp sampler2D)
 0:67        Constant:
 0:67          0.100000
 0:67          0.200000
-0:68      Function Call: texture2D(s21;vf2; (global mediump 4-component vector of float)
+0:68      texture (global mediump 4-component vector of float)
 0:68        'samplerMed' (uniform mediump sampler2D)
 0:68        Constant:
 0:68          0.100000
 0:68          0.200000
-0:69      Function Call: texture2D(s21;vf2; (global highp 4-component vector of float)
+0:69      texture (global highp 4-component vector of float)
 0:69        'samplerHigh' (uniform highp sampler2D)
 0:69        Constant:
 0:69          0.100000
@@ -218,17 +218,17 @@ ERROR: node is still EOpNull!
 0:65                  'level1_high' (temp highp int)
 0:65            Constant:
 0:65              0 (const int)
-0:67      Function Call: texture2D(s21;vf2; (global lowp 4-component vector of float)
+0:67      texture (global lowp 4-component vector of float)
 0:67        'samplerLow' (uniform lowp sampler2D)
 0:67        Constant:
 0:67          0.100000
 0:67          0.200000
-0:68      Function Call: texture2D(s21;vf2; (global mediump 4-component vector of float)
+0:68      texture (global mediump 4-component vector of float)
 0:68        'samplerMed' (uniform mediump sampler2D)
 0:68        Constant:
 0:68          0.100000
 0:68          0.200000
-0:69      Function Call: texture2D(s21;vf2; (global highp 4-component vector of float)
+0:69      texture (global highp 4-component vector of float)
 0:69        'samplerHigh' (uniform highp sampler2D)
 0:69        Constant:
 0:69          0.100000

--- a/Test/baseResults/precision.vert.out
+++ b/Test/baseResults/precision.vert.out
@@ -13,21 +13,21 @@ ERROR: node is still EOpNull!
 0:20      Sequence
 0:20        move second child to first child (temp highp 4-component vector of float)
 0:20          't' (temp highp 4-component vector of float)
-0:20          Function Call: texture(s21;vf2; (global highp 4-component vector of float)
+0:20          texture (global highp 4-component vector of float)
 0:20            's2D' (uniform lowp sampler2D)
 0:20            Constant:
 0:20              0.100000
 0:20              0.200000
 0:21      add second child into first child (temp highp 4-component vector of float)
 0:21        't' (temp highp 4-component vector of float)
-0:21        Function Call: texture(s21;vf2; (global highp 4-component vector of float)
+0:21        texture (global highp 4-component vector of float)
 0:21          's2Dhigh' (uniform highp sampler2D)
 0:21          Constant:
 0:21            0.100000
 0:21            0.200000
 0:22      add second child into first child (temp highp 4-component vector of float)
 0:22        't' (temp highp 4-component vector of float)
-0:22        Function Call: texture(sAS21;vf4; (global highp float)
+0:22        texture (global highp float)
 0:22          's2dAS' (uniform mediump sampler2DArrayShadow)
 0:22          Constant:
 0:22            0.500000
@@ -61,21 +61,21 @@ ERROR: node is still EOpNull!
 0:20      Sequence
 0:20        move second child to first child (temp highp 4-component vector of float)
 0:20          't' (temp highp 4-component vector of float)
-0:20          Function Call: texture(s21;vf2; (global highp 4-component vector of float)
+0:20          texture (global highp 4-component vector of float)
 0:20            's2D' (uniform lowp sampler2D)
 0:20            Constant:
 0:20              0.100000
 0:20              0.200000
 0:21      add second child into first child (temp highp 4-component vector of float)
 0:21        't' (temp highp 4-component vector of float)
-0:21        Function Call: texture(s21;vf2; (global highp 4-component vector of float)
+0:21        texture (global highp 4-component vector of float)
 0:21          's2Dhigh' (uniform highp sampler2D)
 0:21          Constant:
 0:21            0.100000
 0:21            0.200000
 0:22      add second child into first child (temp highp 4-component vector of float)
 0:22        't' (temp highp 4-component vector of float)
-0:22        Function Call: texture(sAS21;vf4; (global highp float)
+0:22        texture (global highp float)
 0:22          's2dAS' (uniform mediump sampler2DArrayShadow)
 0:22          Constant:
 0:22            0.500000

--- a/Test/baseResults/spv.atomic.comp.out
+++ b/Test/baseResults/spv.atomic.comp.out
--- a/Test/baseResults/spv.test.vert.out
+++ b/Test/baseResults/spv.test.vert.out
@@ -5,4 +5,54 @@ WARNING: 0:5: attribute deprecated in version 130; may be removed in future rele
 Linked vertex stage:
-Missing functionality: ftransform()
+// Module Version 99
+// Generated by (magic number): 51a00bb
+// Id's are bound by 28
+                              Source GLSL 130
+                              Capability Shader
+               1:             ExtInstImport  "GLSL.std.450"
+                              MemoryModel Logical GLSL450
+                              EntryPoint Vertex 4  "main"
+                              Name 4  "main"
+                              Name 10  "uv"
+                              Name 12  "uv_in"
+                              Name 16  "gl_Position"
+                              Name 19  "transform"
+                              Name 22  "position"
+                              Name 27  "gl_VertexID"
+                              Decorate 10(uv) Smooth
+                              Decorate 16(gl_Position) BuiltIn Position
+                              Decorate 27(gl_VertexID) BuiltIn VertexId
+                              Decorate 27(gl_VertexID) NoStaticUse
+               2:             TypeVoid
+               3:             TypeFunction 2
+               7:             TypeFloat 32
+               8:             TypeVector 7(float) 2
+               9:             TypePointer Output 8(fvec2)
+          10(uv):      9(ptr) Variable Output
+              11:             TypePointer Input 8(fvec2)
+       12(uv_in):     11(ptr) Variable Input
+              14:             TypeVector 7(float) 4
+              15:             TypePointer Output 14(fvec4)
+ 16(gl_Position):     15(ptr) Variable Output
+              17:             TypeMatrix 14(fvec4) 4
+              18:             TypePointer UniformConstant 17
+   19(transform):     18(ptr) Variable UniformConstant
+              21:             TypePointer Input 14(fvec4)
+    22(position):     21(ptr) Variable Input
+              25:             TypeInt 32 1
+              26:             TypePointer Input 25(int)
+ 27(gl_VertexID):     26(ptr) Variable Input
+         4(main):           2 Function None 3
+               5:             Label
+              13:    8(fvec2) Load 12(uv_in)
+                              Store 10(uv) 13
+              20:          17 Load 19(transform)
+              23:   14(fvec4) Load 22(position)
+              24:   14(fvec4) MatrixTimesVector 20 23
+                              Store 16(gl_Position) 24
+                              Branch 6
+               6:             Label
+                              Return
+                              FunctionEnd
--- a/Test/baseResults/structAssignment.frag.out
+++ b/Test/baseResults/structAssignment.frag.out
@@ -39,7 +39,7 @@ Shader version: 130
 0:38                2 (const int)
 0:38            Constant:
 0:38              1 (const int)
-0:38          Function Call: texture2D(s21;vf2; (global 4-component vector of float)
+0:38          texture (global 4-component vector of float)
 0:38            'sampler' (uniform sampler2D)
 0:38            'coord' (smooth in 2-component vector of float)
 0:?   Linker Objects
@@ -91,7 +91,7 @@ Shader version: 130
 0:38                2 (const int)
 0:38            Constant:
 0:38              1 (const int)
-0:38          Function Call: texture2D(s21;vf2; (global 4-component vector of float)
+0:38          texture (global 4-component vector of float)
 0:38            'sampler' (uniform sampler2D)
 0:38            'coord' (smooth in 2-component vector of float)
 0:?   Linker Objects

--- a/Test/baseResults/structDeref.frag.out
+++ b/Test/baseResults/structDeref.frag.out
@@ -158,7 +158,7 @@ Shader version: 130
 0:70                  2 (const int)
 0:70              Constant:
 0:70                1 (const int)
-0:70          Function Call: texture2D(s21;vf2; (global 4-component vector of float)
+0:70          texture (global 4-component vector of float)
 0:70            'sampler' (uniform sampler2D)
 0:70            'coord' (smooth in 2-component vector of float)
 0:?   Linker Objects
@@ -331,7 +331,7 @@ Shader version: 130
 0:70                  2 (const int)
 0:70              Constant:
 0:70                1 (const int)
-0:70          Function Call: texture2D(s21;vf2; (global 4-component vector of float)
+0:70          texture (global 4-component vector of float)
 0:70            'sampler' (uniform sampler2D)
 0:70            'coord' (smooth in 2-component vector of float)
 0:?   Linker Objects

--- a/Test/baseResults/structure.frag.out
+++ b/Test/baseResults/structure.frag.out
@@ -71,7 +71,7 @@ Shader version: 130
 0:29        'gl_FragColor' (fragColor 4-component vector of float FragColor)
 0:29        vector-scale (temp 4-component vector of float)
 0:29          'scale' (temp float)
-0:29          Function Call: texture2D(s21;vf2; (global 4-component vector of float)
+0:29          texture (global 4-component vector of float)
 0:29            'sampler' (uniform sampler2D)
 0:29            'coord' (smooth in 2-component vector of float)
 0:?   Linker Objects
@@ -154,7 +154,7 @@ Shader version: 130
 0:29        'gl_FragColor' (fragColor 4-component vector of float FragColor)
 0:29        vector-scale (temp 4-component vector of float)
 0:29          'scale' (temp float)
-0:29          Function Call: texture2D(s21;vf2; (global 4-component vector of float)
+0:29          texture (global 4-component vector of float)
 0:29            'sampler' (uniform sampler2D)
 0:29            'coord' (smooth in 2-component vector of float)
 0:?   Linker Objects

--- a/Test/baseResults/test.frag.out
+++ b/Test/baseResults/test.frag.out
@@ -13,7 +13,7 @@ Shader version: 110
 0:17        move second child to first child (temp 4-component vector of float)
 0:17          'v' (temp 4-component vector of float)
 0:17          vector swizzle (temp 4-component vector of float)
-0:17            Function Call: texture2D(s21;vf2; (global 4-component vector of float)
+0:17            texture (global 4-component vector of float)
 0:17              'texSampler2D' (uniform sampler2D)
 0:17              divide (temp 2-component vector of float)
 0:17                add (temp 2-component vector of float)
@@ -33,7 +33,7 @@ Shader version: 110
 0:19        move second child to first child (temp 4-component vector of float)
 0:19          'w' (temp 4-component vector of float)
 0:19          add (temp 4-component vector of float)
-0:19            Function Call: texture3D(s31;vf3; (global 4-component vector of float)
+0:19            texture (global 4-component vector of float)
 0:19              'texSampler3D' (uniform sampler3D)
 0:19              'coords' (smooth in 3-component vector of float)
 0:19            'v' (temp 4-component vector of float)
@@ -72,7 +72,7 @@ Shader version: 110
 0:17        move second child to first child (temp 4-component vector of float)
 0:17          'v' (temp 4-component vector of float)
 0:17          vector swizzle (temp 4-component vector of float)
-0:17            Function Call: texture2D(s21;vf2; (global 4-component vector of float)
+0:17            texture (global 4-component vector of float)
 0:17              'texSampler2D' (uniform sampler2D)
 0:17              divide (temp 2-component vector of float)
 0:17                add (temp 2-component vector of float)
@@ -92,7 +92,7 @@ Shader version: 110
 0:19        move second child to first child (temp 4-component vector of float)
 0:19          'w' (temp 4-component vector of float)
 0:19          add (temp 4-component vector of float)
-0:19            Function Call: texture3D(s31;vf3; (global 4-component vector of float)
+0:19            texture (global 4-component vector of float)
 0:19              'texSampler3D' (uniform sampler3D)
 0:19              'coords' (smooth in 3-component vector of float)
 0:19            'v' (temp 4-component vector of float)

--- a/Test/baseResults/texture.frag.out
+++ b/Test/baseResults/texture.frag.out
--- a/Test/baseResults/uint.frag.out
+++ b/Test/baseResults/uint.frag.out
@@ -113,7 +113,7 @@ ERROR: node is still EOpNull!
 0:55        true case
 0:56        move second child to first child (temp mediump 4-component vector of uint)
 0:56          'c' (out mediump 4-component vector of uint)
-0:56          Function Call: texture(us21;vf2; (global mediump 4-component vector of uint)
+0:56          texture (global mediump 4-component vector of uint)
 0:56            'usampler' (uniform lowp usampler2D)
 0:56            'tc' (smooth in highp 2-component vector of float)
 0:57      Test condition and select (temp void)
@@ -124,7 +124,7 @@ ERROR: node is still EOpNull!
 0:57        true case
 0:58        move second child to first child (temp mediump 4-component vector of uint)
 0:58          'c' (out mediump 4-component vector of uint)
-0:58          Function Call: texture(us21;vf2; (global mediump 4-component vector of uint)
+0:58          texture (global mediump 4-component vector of uint)
 0:58            'usampler' (uniform lowp usampler2D)
 0:58            add (temp highp 2-component vector of float)
 0:58              'tc' (smooth in highp 2-component vector of float)
@@ -139,7 +139,7 @@ ERROR: node is still EOpNull!
 0:59        true case
 0:60        move second child to first child (temp mediump 4-component vector of uint)
 0:60          'c' (out mediump 4-component vector of uint)
-0:60          Function Call: texture(us21;vf2; (global mediump 4-component vector of uint)
+0:60          texture (global mediump 4-component vector of uint)
 0:60            'usampler' (uniform lowp usampler2D)
 0:60            subtract (temp highp 2-component vector of float)
 0:60              'tc' (smooth in highp 2-component vector of float)
@@ -412,7 +412,7 @@ ERROR: node is still EOpNull!
 0:55        true case
 0:56        move second child to first child (temp mediump 4-component vector of uint)
 0:56          'c' (out mediump 4-component vector of uint)
-0:56          Function Call: texture(us21;vf2; (global mediump 4-component vector of uint)
+0:56          texture (global mediump 4-component vector of uint)
 0:56            'usampler' (uniform lowp usampler2D)
 0:56            'tc' (smooth in highp 2-component vector of float)
 0:57      Test condition and select (temp void)
@@ -423,7 +423,7 @@ ERROR: node is still EOpNull!
 0:57        true case
 0:58        move second child to first child (temp mediump 4-component vector of uint)
 0:58          'c' (out mediump 4-component vector of uint)
-0:58          Function Call: texture(us21;vf2; (global mediump 4-component vector of uint)
+0:58          texture (global mediump 4-component vector of uint)
 0:58            'usampler' (uniform lowp usampler2D)
 0:58            add (temp highp 2-component vector of float)
 0:58              'tc' (smooth in highp 2-component vector of float)
@@ -438,7 +438,7 @@ ERROR: node is still EOpNull!
 0:59        true case
 0:60        move second child to first child (temp mediump 4-component vector of uint)
 0:60          'c' (out mediump 4-component vector of uint)
-0:60          Function Call: texture(us21;vf2; (global mediump 4-component vector of uint)
+0:60          texture (global mediump 4-component vector of uint)
 0:60            'usampler' (uniform lowp usampler2D)
 0:60            subtract (temp highp 2-component vector of float)
 0:60              'tc' (smooth in highp 2-component vector of float)

--- a/Test/baseResults/variableArrayIndex.frag.out
+++ b/Test/baseResults/variableArrayIndex.frag.out
@@ -74,7 +74,7 @@ Shader version: 130
 0:43        'gl_FragColor' (fragColor 4-component vector of float FragColor)
 0:43        vector-scale (temp 4-component vector of float)
 0:43          'scale' (temp float)
-0:43          Function Call: texture2D(s21;vf2; (global 4-component vector of float)
+0:43          texture (global 4-component vector of float)
 0:43            'sampler' (uniform sampler2D)
 0:43            'coord' (smooth in 2-component vector of float)
 0:45      Sequence
@@ -187,7 +187,7 @@ Shader version: 130
 0:43        'gl_FragColor' (fragColor 4-component vector of float FragColor)
 0:43        vector-scale (temp 4-component vector of float)
 0:43          'scale' (temp float)
-0:43          Function Call: texture2D(s21;vf2; (global 4-component vector of float)
+0:43          texture (global 4-component vector of float)
 0:43            'sampler' (uniform sampler2D)
 0:43            'coord' (smooth in 2-component vector of float)
 0:45      Sequence

--- a/Test/baseResults/varyingArray.frag.out
+++ b/Test/baseResults/varyingArray.frag.out
@@ -12,7 +12,7 @@ Shader version: 130
 0:12      Sequence
 0:12        move second child to first child (temp 4-component vector of float)
 0:12          'texColor' (temp 4-component vector of float)
-0:12          Function Call: texture2D(s21;vf2; (global 4-component vector of float)
+0:12          texture (global 4-component vector of float)
 0:12            'texSampler2D' (uniform sampler2D)
 0:12            Construct vec2 (temp 2-component vector of float)
 0:12              add (temp 4-component vector of float)
@@ -71,7 +71,7 @@ Shader version: 130
 0:12      Sequence
 0:12        move second child to first child (temp 4-component vector of float)
 0:12          'texColor' (temp 4-component vector of float)
-0:12          Function Call: texture2D(s21;vf2; (global 4-component vector of float)
+0:12          texture (global 4-component vector of float)
 0:12            'texSampler2D' (uniform sampler2D)
 0:12            Construct vec2 (temp 2-component vector of float)
 0:12              add (temp 4-component vector of float)

--- a/Test/baseResults/varyingArrayIndirect.frag.out
+++ b/Test/baseResults/varyingArrayIndirect.frag.out
@@ -12,7 +12,7 @@ Shader version: 130
 0:14      Sequence
 0:14        move second child to first child (temp 4-component vector of float)
 0:14          'texColor' (temp 4-component vector of float)
-0:14          Function Call: texture2D(s21;vf2; (global 4-component vector of float)
+0:14          texture (global 4-component vector of float)
 0:14            'texSampler2D' (uniform sampler2D)
 0:14            Construct vec2 (temp 2-component vector of float)
 0:14              add (temp 4-component vector of float)
@@ -74,7 +74,7 @@ Shader version: 130
 0:14      Sequence
 0:14        move second child to first child (temp 4-component vector of float)
 0:14          'texColor' (temp 4-component vector of float)
-0:14          Function Call: texture2D(s21;vf2; (global 4-component vector of float)
+0:14          texture (global 4-component vector of float)
 0:14            'texSampler2D' (uniform sampler2D)
 0:14            Construct vec2 (temp 2-component vector of float)
 0:14              add (temp 4-component vector of float)

--- a/Test/spv.test.vert
+++ b/Test/spv.test.vert
@@ -10,5 +10,5 @@ out vec2 uv;
 void main()
 {
    uv = uv_in;
-    gl_Position = position + ftransform();
+    gl_Position = transform * position;
 }
--- a/glslang/Include/revision.h
+++ b/glslang/Include/revision.h
@@ -2,5 +2,5 @@
 // For the version, it uses the latest git tag followed by the number of commits.
 // For the date, it uses the current date (when then script is run).
-#define GLSLANG_REVISION "2.4.727"
+#define GLSLANG_REVISION "3.0.729"
 #define GLSLANG_DATE "19-Aug-2015"
--- a/glslang/MachineIndependent/Initialize.cpp
+++ b/glslang/MachineIndependent/Initialize.cpp
@@ -59,7 +59,8 @@ bool ARBCompatibility = true;
 const bool ForwardCompatibility = false;
 // change this back to false if depending on textual spellings of texturing calls when consuming the AST
-bool PureOperatorBuiltins = false;
+// Using PureOperatorBuiltins=false is deprecated.
+bool PureOperatorBuiltins = true;
 inline bool IncludeLegacy(int version, EProfile profile)
 {