mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Backward incompatible: Turn on PureOperatorBuiltins: use only enum-based built-in functions in the AST.

Browse Source 
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.
This commit is contained in:
John Kessenich
2015-08-19 13:34:18 -06:00
parent a32d8f620d
commit fc51d284aa
41 changed files with 1092 additions and 967 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
Test/baseResults/100.frag.out
View File

@@ -177,7 +177,7 @@ ERROR: node is still EOpNull!
0:87 Function Definition: foo234( (global void)
0:87 Function Parameters:
0:89 Sequence
0:89 Function Call: texture3D(s31;vf3;f1; (global highp 4-component vector of float)
0:89 texture (global highp 4-component vector of float)
0:89 's3D2' (uniform highp sampler3D)
0:89 Constant:
0:89 0.200000
@@ -185,7 +185,7 @@ ERROR: node is still EOpNull!
0:89 0.200000
0:89 Constant:
0:89 0.200000
0:90 Function Call: texture3DProj(s31;vf4;f1; (global highp 4-component vector of float)
0:90 textureProj (global highp 4-component vector of float)
0:90 's3D2' (uniform highp sampler3D)
0:90 direct index (smooth temp mediump 4-component vector of float)
0:90 'v' (smooth in 3-element array of mediump 4-component vector of float)
@@ -232,16 +232,16 @@ ERROR: node is still EOpNull!
0:119 Function Definition: foo245( (global void)
0:119 Function Parameters:
0:121 Sequence
0:121 Function Call: texture2D(sE21;vf2; (global lowp 4-component vector of float)
0:121 texture (global lowp 4-component vector of float)
0:121 'sExt' (uniform lowp samplerExternalOES)
0:121 Constant:
0:121 0.200000
0:121 0.200000
0:122 Function Call: texture2DProj(sE21;vf3; (global lowp 4-component vector of float)
0:122 textureProj (global lowp 4-component vector of float)
0:122 'sExt' (uniform lowp samplerExternalOES)
0:122 Construct vec3 (temp 3-component vector of float)
0:122 Construct vec3 (temp lowp 3-component vector of float)
0:122 'f13' (invariant global mediump float)
0:123 Function Call: texture2DProj(sE21;vf4; (global lowp 4-component vector of float)
0:123 textureProj (global lowp 4-component vector of float)
0:123 'sExt' (uniform lowp samplerExternalOES)
0:123 direct index (smooth temp mediump 4-component vector of float)
0:123 'v' (smooth in 3-element array of mediump 4-component vector of float)
@@ -250,12 +250,12 @@ ERROR: node is still EOpNull!
0:130 Function Definition: foo246( (global void)
0:130 Function Parameters:
0:132 Sequence
0:132 Function Call: texture2D(sE21;vf2; (global mediump 4-component vector of float)
0:132 texture (global mediump 4-component vector of float)
0:132 'mediumExt' (uniform mediump samplerExternalOES)
0:132 Constant:
0:132 0.200000
0:132 0.200000
0:133 Function Call: texture2DProj(sE21;vf4; (global highp 4-component vector of float)
0:133 textureProj (global highp 4-component vector of float)
0:133 'highExt' (uniform highp samplerExternalOES)
0:133 direct index (smooth temp mediump 4-component vector of float)
0:133 'v' (smooth in 3-element array of mediump 4-component vector of float)
@@ -278,9 +278,9 @@ ERROR: node is still EOpNull!
0:145 'a' (in mediump int)
0:145 'b' (in mediump float)
0:147 Sequence
0:147 Function Call: texture2DProjGradEXT(s21;vf3;vf2;vf2; (global lowp 4-component vector of float)
0:147 textureProjGrad (global lowp 4-component vector of float)
0:147 's2Dg' (uniform lowp sampler2D)
0:147 Construct vec3 (temp 3-component vector of float)
0:147 Construct vec3 (temp mediump 3-component vector of float)
0:147 'f13' (invariant global mediump float)
0:147 'uv2' (invariant uniform mediump 2-component vector of float)
0:147 'uv2' (invariant uniform mediump 2-component vector of float)
@@ -299,28 +299,28 @@ ERROR: node is still EOpNull!
0:158 Function Definition: foo323433( (global void)
0:158 Function Parameters:
0:160 Sequence
0:160 Function Call: texture2DLodEXT(s21;vf2;f1; (global lowp 4-component vector of float)
0:160 textureLod (global lowp 4-component vector of float)
0:160 's2Dg' (uniform lowp sampler2D)
0:160 'uv2' (invariant uniform mediump 2-component vector of float)
0:160 'f13' (invariant global mediump float)
0:161 Function Call: texture2DProjGradEXT(s21;vf3;vf2;vf2; (global lowp 4-component vector of float)
0:161 textureProjGrad (global lowp 4-component vector of float)
0:161 's2Dg' (uniform lowp sampler2D)
0:161 Construct vec3 (temp 3-component vector of float)
0:161 Construct vec3 (temp mediump 3-component vector of float)
0:161 'f13' (invariant global mediump float)
0:161 'uv2' (invariant uniform mediump 2-component vector of float)
0:161 'uv2' (invariant uniform mediump 2-component vector of float)
0:162 Function Call: texture2DGradEXT(s21;vf2;vf2;vf2; (global lowp 4-component vector of float)
0:162 textureGrad (global lowp 4-component vector of float)
0:162 's2Dg' (uniform lowp sampler2D)
0:162 'uv2' (invariant uniform mediump 2-component vector of float)
0:162 'uv2' (invariant uniform mediump 2-component vector of float)
0:162 'uv2' (invariant uniform mediump 2-component vector of float)
0:163 Function Call: textureCubeGradEXT(sC1;vf3;vf3;vf3; (global lowp 4-component vector of float)
0:163 textureGrad (global lowp 4-component vector of float)
0:163 'sCube' (uniform lowp samplerCube)
0:163 Construct vec3 (temp 3-component vector of float)
0:163 Construct vec3 (temp lowp 3-component vector of float)
0:163 'f13' (invariant global mediump float)
0:163 Construct vec3 (temp 3-component vector of float)
0:163 Construct vec3 (temp lowp 3-component vector of float)
0:163 'f13' (invariant global mediump float)
0:163 Construct vec3 (temp 3-component vector of float)
0:163 Construct vec3 (temp lowp 3-component vector of float)
0:163 'f13' (invariant global mediump float)
0:167 Function Definition: fgfg(f1;i1; (global mediump int)
0:167 Function Parameters:
@@ -501,7 +501,7 @@ ERROR: node is still EOpNull!
0:87 Function Definition: foo234( (global void)
0:87 Function Parameters:
0:89 Sequence
0:89 Function Call: texture3D(s31;vf3;f1; (global highp 4-component vector of float)
0:89 texture (global highp 4-component vector of float)
0:89 's3D2' (uniform highp sampler3D)
0:89 Constant:
0:89 0.200000
@@ -509,7 +509,7 @@ ERROR: node is still EOpNull!
0:89 0.200000
0:89 Constant:
0:89 0.200000
0:90 Function Call: texture3DProj(s31;vf4;f1; (global highp 4-component vector of float)
0:90 textureProj (global highp 4-component vector of float)
0:90 's3D2' (uniform highp sampler3D)
0:90 direct index (smooth temp mediump 4-component vector of float)
0:90 'v' (smooth in 3-element array of mediump 4-component vector of float)
@@ -556,16 +556,16 @@ ERROR: node is still EOpNull!
0:119 Function Definition: foo245( (global void)
0:119 Function Parameters:
0:121 Sequence
0:121 Function Call: texture2D(sE21;vf2; (global lowp 4-component vector of float)
0:121 texture (global lowp 4-component vector of float)
0:121 'sExt' (uniform lowp samplerExternalOES)
0:121 Constant:
0:121 0.200000
0:121 0.200000
0:122 Function Call: texture2DProj(sE21;vf3; (global lowp 4-component vector of float)
0:122 textureProj (global lowp 4-component vector of float)
0:122 'sExt' (uniform lowp samplerExternalOES)
0:122 Construct vec3 (temp 3-component vector of float)
0:122 Construct vec3 (temp lowp 3-component vector of float)
0:122 'f13' (invariant global mediump float)
0:123 Function Call: texture2DProj(sE21;vf4; (global lowp 4-component vector of float)
0:123 textureProj (global lowp 4-component vector of float)
0:123 'sExt' (uniform lowp samplerExternalOES)
0:123 direct index (smooth temp mediump 4-component vector of float)
0:123 'v' (smooth in 3-element array of mediump 4-component vector of float)
@@ -574,12 +574,12 @@ ERROR: node is still EOpNull!
0:130 Function Definition: foo246( (global void)
0:130 Function Parameters:
0:132 Sequence
0:132 Function Call: texture2D(sE21;vf2; (global mediump 4-component vector of float)
0:132 texture (global mediump 4-component vector of float)
0:132 'mediumExt' (uniform mediump samplerExternalOES)
0:132 Constant:
0:132 0.200000
0:132 0.200000
0:133 Function Call: texture2DProj(sE21;vf4; (global highp 4-component vector of float)
0:133 textureProj (global highp 4-component vector of float)
0:133 'highExt' (uniform highp samplerExternalOES)
0:133 direct index (smooth temp mediump 4-component vector of float)
0:133 'v' (smooth in 3-element array of mediump 4-component vector of float)
@@ -602,9 +602,9 @@ ERROR: node is still EOpNull!
0:145 'a' (in mediump int)
0:145 'b' (in mediump float)
0:147 Sequence
0:147 Function Call: texture2DProjGradEXT(s21;vf3;vf2;vf2; (global lowp 4-component vector of float)
0:147 textureProjGrad (global lowp 4-component vector of float)
0:147 's2Dg' (uniform lowp sampler2D)
0:147 Construct vec3 (temp 3-component vector of float)
0:147 Construct vec3 (temp mediump 3-component vector of float)
0:147 'f13' (invariant global mediump float)
0:147 'uv2' (invariant uniform mediump 2-component vector of float)
0:147 'uv2' (invariant uniform mediump 2-component vector of float)
@@ -623,28 +623,28 @@ ERROR: node is still EOpNull!
0:158 Function Definition: foo323433( (global void)
0:158 Function Parameters:
0:160 Sequence
0:160 Function Call: texture2DLodEXT(s21;vf2;f1; (global lowp 4-component vector of float)
0:160 textureLod (global lowp 4-component vector of float)
0:160 's2Dg' (uniform lowp sampler2D)
0:160 'uv2' (invariant uniform mediump 2-component vector of float)
0:160 'f13' (invariant global mediump float)
0:161 Function Call: texture2DProjGradEXT(s21;vf3;vf2;vf2; (global lowp 4-component vector of float)
0:161 textureProjGrad (global lowp 4-component vector of float)
0:161 's2Dg' (uniform lowp sampler2D)
0:161 Construct vec3 (temp 3-component vector of float)
0:161 Construct vec3 (temp mediump 3-component vector of float)
0:161 'f13' (invariant global mediump float)
0:161 'uv2' (invariant uniform mediump 2-component vector of float)
0:161 'uv2' (invariant uniform mediump 2-component vector of float)
0:162 Function Call: texture2DGradEXT(s21;vf2;vf2;vf2; (global lowp 4-component vector of float)
0:162 textureGrad (global lowp 4-component vector of float)
0:162 's2Dg' (uniform lowp sampler2D)
0:162 'uv2' (invariant uniform mediump 2-component vector of float)
0:162 'uv2' (invariant uniform mediump 2-component vector of float)
0:162 'uv2' (invariant uniform mediump 2-component vector of float)
0:163 Function Call: textureCubeGradEXT(sC1;vf3;vf3;vf3; (global lowp 4-component vector of float)
0:163 textureGrad (global lowp 4-component vector of float)
0:163 'sCube' (uniform lowp samplerCube)
0:163 Construct vec3 (temp 3-component vector of float)
0:163 Construct vec3 (temp lowp 3-component vector of float)
0:163 'f13' (invariant global mediump float)
0:163 Construct vec3 (temp 3-component vector of float)
0:163 Construct vec3 (temp lowp 3-component vector of float)
0:163 'f13' (invariant global mediump float)
0:163 Construct vec3 (temp 3-component vector of float)
0:163 Construct vec3 (temp lowp 3-component vector of float)
0:163 'f13' (invariant global mediump float)
0:167 Function Definition: fgfg(f1;i1; (global mediump int)
0:167 Function Parameters: