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

88
Test/baseResults/120.frag.out
View File

@@ -242,7 +242,7 @@ ERROR: node is still EOpNull!
0:63 'f' (temp float)
0:65 move second child to first child (temp 4-component vector of float)
0:65 'gl_FragColor' (fragColor 4-component vector of float FragColor)
0:65 Function Call: texture2D(s21;vf2; (global 4-component vector of float)
0:65 texture (global 4-component vector of float)
0:65 's2D' (uniform sampler2D)
0:65 'centTexCoord' (centroid smooth in 2-component vector of float)
0:? Sequence
@@ -454,45 +454,45 @@ ERROR: node is still EOpNull!
0:? Sequence
0:184 move second child to first child (temp 4-component vector of float)
0:184 'v' (temp 4-component vector of float)
0:184 Function Call: texture2DLod(s21;vf2;f1; (global 4-component vector of float)
0:184 textureLod (global 4-component vector of float)
0:184 's2D' (uniform sampler2D)
0:184 'v2' (temp 2-component vector of float)
0:184 'f' (temp float)
0:185 move second child to first child (temp 4-component vector of float)
0:185 'v' (temp 4-component vector of float)
0:185 Function Call: texture3DProjLod(s31;vf4;f1; (global 4-component vector of float)
0:185 textureProjLod (global 4-component vector of float)
0:185 's3D' (uniform sampler3D)
0:185 'v' (temp 4-component vector of float)
0:185 'f' (temp float)
0:186 move second child to first child (temp 4-component vector of float)
0:186 'v' (temp 4-component vector of float)
0:186 Function Call: texture1DProjLod(s11;vf4;f1; (global 4-component vector of float)
0:186 textureProjLod (global 4-component vector of float)
0:186 's1D' (uniform sampler1D)
0:186 'v' (temp 4-component vector of float)
0:186 'f' (temp float)
0:187 move second child to first child (temp 4-component vector of float)
0:187 'v' (temp 4-component vector of float)
0:187 Function Call: shadow2DProjLod(sS21;vf4;f1; (global 4-component vector of float)
0:187 textureProjLod (global 4-component vector of float)
0:187 's2DS' (uniform sampler2DShadow)
0:187 'v' (temp 4-component vector of float)
0:187 'f' (temp float)
0:189 move second child to first child (temp 4-component vector of float)
0:189 'v' (temp 4-component vector of float)
0:189 Function Call: texture1DGradARB(s11;f1;f1;f1; (global 4-component vector of float)
0:189 textureGrad (global 4-component vector of float)
0:189 's1D' (uniform sampler1D)
0:189 'f' (temp float)
0:189 'f' (temp float)
0:189 'f' (temp float)
0:190 move second child to first child (temp 4-component vector of float)
0:190 'v' (temp 4-component vector of float)
0:190 Function Call: texture2DProjGradARB(s21;vf4;vf2;vf2; (global 4-component vector of float)
0:190 textureProjGrad (global 4-component vector of float)
0:190 's2D' (uniform sampler2D)
0:190 'v' (temp 4-component vector of float)
0:190 'v2' (temp 2-component vector of float)
0:190 'v2' (temp 2-component vector of float)
0:191 move second child to first child (temp 4-component vector of float)
0:191 'v' (temp 4-component vector of float)
0:191 Function Call: shadow2DProjGradARB(sS21;vf4;vf2;vf2; (global 4-component vector of float)
0:191 textureProjGrad (global 4-component vector of float)
0:191 's2DS' (uniform sampler2DShadow)
0:191 'v' (temp 4-component vector of float)
0:191 'v2' (temp 2-component vector of float)
@@ -502,45 +502,45 @@ ERROR: node is still EOpNull!
0:? Sequence
0:201 move second child to first child (temp 4-component vector of float)
0:201 'v' (temp 4-component vector of float)
0:201 Function Call: texture2DLod(s21;vf2;f1; (global 4-component vector of float)
0:201 textureLod (global 4-component vector of float)
0:201 's2D' (uniform sampler2D)
0:201 'v2' (temp 2-component vector of float)
0:201 'f' (temp float)
0:202 move second child to first child (temp 4-component vector of float)
0:202 'v' (temp 4-component vector of float)
0:202 Function Call: texture3DProjLod(s31;vf4;f1; (global 4-component vector of float)
0:202 textureProjLod (global 4-component vector of float)
0:202 's3D' (uniform sampler3D)
0:202 'v' (temp 4-component vector of float)
0:202 'f' (temp float)
0:203 move second child to first child (temp 4-component vector of float)
0:203 'v' (temp 4-component vector of float)
0:203 Function Call: texture1DProjLod(s11;vf4;f1; (global 4-component vector of float)
0:203 textureProjLod (global 4-component vector of float)
0:203 's1D' (uniform sampler1D)
0:203 'v' (temp 4-component vector of float)
0:203 'f' (temp float)
0:204 move second child to first child (temp 4-component vector of float)
0:204 'v' (temp 4-component vector of float)
0:204 Function Call: shadow2DProjLod(sS21;vf4;f1; (global 4-component vector of float)
0:204 textureProjLod (global 4-component vector of float)
0:204 's2DS' (uniform sampler2DShadow)
0:204 'v' (temp 4-component vector of float)
0:204 'f' (temp float)
0:206 move second child to first child (temp 4-component vector of float)
0:206 'v' (temp 4-component vector of float)
0:206 Function Call: texture1DGradARB(s11;f1;f1;f1; (global 4-component vector of float)
0:206 textureGrad (global 4-component vector of float)
0:206 's1D' (uniform sampler1D)
0:206 'f' (temp float)
0:206 'f' (temp float)
0:206 'f' (temp float)
0:207 move second child to first child (temp 4-component vector of float)
0:207 'v' (temp 4-component vector of float)
0:207 Function Call: texture2DProjGradARB(s21;vf4;vf2;vf2; (global 4-component vector of float)
0:207 textureProjGrad (global 4-component vector of float)
0:207 's2D' (uniform sampler2D)
0:207 'v' (temp 4-component vector of float)
0:207 'v2' (temp 2-component vector of float)
0:207 'v2' (temp 2-component vector of float)
0:208 move second child to first child (temp 4-component vector of float)
0:208 'v' (temp 4-component vector of float)
0:208 Function Call: shadow2DProjGradARB(sS21;vf4;vf2;vf2; (global 4-component vector of float)
0:208 textureProjGrad (global 4-component vector of float)
0:208 's2DS' (uniform sampler2DShadow)
0:208 'v' (temp 4-component vector of float)
0:208 'v2' (temp 2-component vector of float)
@@ -552,7 +552,7 @@ ERROR: node is still EOpNull!
0:217 Sequence
0:217 move second child to first child (temp 4-component vector of float)
0:217 'v' (temp 4-component vector of float)
0:217 Function Call: texture2DRect(sR21;vf2; (global 4-component vector of float)
0:217 texture (global 4-component vector of float)
0:217 's2DRbad' (uniform sampler2DRect)
0:217 'v2' (temp 2-component vector of float)
0:225 Function Definition: foo12111( (global void)
@@ -560,32 +560,32 @@ ERROR: node is still EOpNull!
0:? Sequence
0:231 move second child to first child (temp 4-component vector of float)
0:231 'v' (temp 4-component vector of float)
0:231 Function Call: texture2DRect(sR21;vf2; (global 4-component vector of float)
0:231 texture (global 4-component vector of float)
0:231 's2DR' (uniform sampler2DRect)
0:231 'v2' (temp 2-component vector of float)
0:232 move second child to first child (temp 4-component vector of float)
0:232 'v' (temp 4-component vector of float)
0:232 Function Call: texture2DRectProj(sR21;vf3; (global 4-component vector of float)
0:232 textureProj (global 4-component vector of float)
0:232 's2DR' (uniform sampler2DRect)
0:232 'v3' (temp 3-component vector of float)
0:233 move second child to first child (temp 4-component vector of float)
0:233 'v' (temp 4-component vector of float)
0:233 Function Call: texture2DRectProj(sR21;vf4; (global 4-component vector of float)
0:233 textureProj (global 4-component vector of float)
0:233 's2DR' (uniform sampler2DRect)
0:233 'v4' (temp 4-component vector of float)
0:234 move second child to first child (temp 4-component vector of float)
0:234 'v' (temp 4-component vector of float)
0:234 Function Call: shadow2DRect(sSR21;vf3; (global 4-component vector of float)
0:234 texture (global 4-component vector of float)
0:234 's2DRS' (uniform sampler2DRectShadow)
0:234 'v3' (temp 3-component vector of float)
0:235 move second child to first child (temp 4-component vector of float)
0:235 'v' (temp 4-component vector of float)
0:235 Function Call: shadow2DRectProj(sSR21;vf4; (global 4-component vector of float)
0:235 textureProj (global 4-component vector of float)
0:235 's2DRS' (uniform sampler2DRectShadow)
0:235 'v4' (temp 4-component vector of float)
0:237 move second child to first child (temp 4-component vector of float)
0:237 'v' (temp 4-component vector of float)
0:237 Function Call: shadow2DRectProjGradARB(sSR21;vf4;vf2;vf2; (global 4-component vector of float)
0:237 textureProjGrad (global 4-component vector of float)
0:237 's2DRS' (uniform sampler2DRectShadow)
0:237 'v' (temp 4-component vector of float)
0:237 'v2' (temp 2-component vector of float)
@@ -813,7 +813,7 @@ ERROR: node is still EOpNull!
0:63 'f' (temp float)
0:65 move second child to first child (temp 4-component vector of float)
0:65 'gl_FragColor' (fragColor 4-component vector of float FragColor)
0:65 Function Call: texture2D(s21;vf2; (global 4-component vector of float)
0:65 texture (global 4-component vector of float)
0:65 's2D' (uniform sampler2D)
0:65 'centTexCoord' (centroid smooth in 2-component vector of float)
0:? Sequence
@@ -1025,45 +1025,45 @@ ERROR: node is still EOpNull!
0:? Sequence
0:184 move second child to first child (temp 4-component vector of float)
0:184 'v' (temp 4-component vector of float)
0:184 Function Call: texture2DLod(s21;vf2;f1; (global 4-component vector of float)
0:184 textureLod (global 4-component vector of float)
0:184 's2D' (uniform sampler2D)
0:184 'v2' (temp 2-component vector of float)
0:184 'f' (temp float)
0:185 move second child to first child (temp 4-component vector of float)
0:185 'v' (temp 4-component vector of float)
0:185 Function Call: texture3DProjLod(s31;vf4;f1; (global 4-component vector of float)
0:185 textureProjLod (global 4-component vector of float)
0:185 's3D' (uniform sampler3D)
0:185 'v' (temp 4-component vector of float)
0:185 'f' (temp float)
0:186 move second child to first child (temp 4-component vector of float)
0:186 'v' (temp 4-component vector of float)
0:186 Function Call: texture1DProjLod(s11;vf4;f1; (global 4-component vector of float)
0:186 textureProjLod (global 4-component vector of float)
0:186 's1D' (uniform sampler1D)
0:186 'v' (temp 4-component vector of float)
0:186 'f' (temp float)
0:187 move second child to first child (temp 4-component vector of float)
0:187 'v' (temp 4-component vector of float)
0:187 Function Call: shadow2DProjLod(sS21;vf4;f1; (global 4-component vector of float)
0:187 textureProjLod (global 4-component vector of float)
0:187 's2DS' (uniform sampler2DShadow)
0:187 'v' (temp 4-component vector of float)
0:187 'f' (temp float)
0:189 move second child to first child (temp 4-component vector of float)
0:189 'v' (temp 4-component vector of float)
0:189 Function Call: texture1DGradARB(s11;f1;f1;f1; (global 4-component vector of float)
0:189 textureGrad (global 4-component vector of float)
0:189 's1D' (uniform sampler1D)
0:189 'f' (temp float)
0:189 'f' (temp float)
0:189 'f' (temp float)
0:190 move second child to first child (temp 4-component vector of float)
0:190 'v' (temp 4-component vector of float)
0:190 Function Call: texture2DProjGradARB(s21;vf4;vf2;vf2; (global 4-component vector of float)
0:190 textureProjGrad (global 4-component vector of float)
0:190 's2D' (uniform sampler2D)
0:190 'v' (temp 4-component vector of float)
0:190 'v2' (temp 2-component vector of float)
0:190 'v2' (temp 2-component vector of float)
0:191 move second child to first child (temp 4-component vector of float)
0:191 'v' (temp 4-component vector of float)
0:191 Function Call: shadow2DProjGradARB(sS21;vf4;vf2;vf2; (global 4-component vector of float)
0:191 textureProjGrad (global 4-component vector of float)
0:191 's2DS' (uniform sampler2DShadow)
0:191 'v' (temp 4-component vector of float)
0:191 'v2' (temp 2-component vector of float)
@@ -1073,45 +1073,45 @@ ERROR: node is still EOpNull!
0:? Sequence
0:201 move second child to first child (temp 4-component vector of float)
0:201 'v' (temp 4-component vector of float)
0:201 Function Call: texture2DLod(s21;vf2;f1; (global 4-component vector of float)
0:201 textureLod (global 4-component vector of float)
0:201 's2D' (uniform sampler2D)
0:201 'v2' (temp 2-component vector of float)
0:201 'f' (temp float)
0:202 move second child to first child (temp 4-component vector of float)
0:202 'v' (temp 4-component vector of float)
0:202 Function Call: texture3DProjLod(s31;vf4;f1; (global 4-component vector of float)
0:202 textureProjLod (global 4-component vector of float)
0:202 's3D' (uniform sampler3D)
0:202 'v' (temp 4-component vector of float)
0:202 'f' (temp float)
0:203 move second child to first child (temp 4-component vector of float)
0:203 'v' (temp 4-component vector of float)
0:203 Function Call: texture1DProjLod(s11;vf4;f1; (global 4-component vector of float)
0:203 textureProjLod (global 4-component vector of float)
0:203 's1D' (uniform sampler1D)
0:203 'v' (temp 4-component vector of float)
0:203 'f' (temp float)
0:204 move second child to first child (temp 4-component vector of float)
0:204 'v' (temp 4-component vector of float)
0:204 Function Call: shadow2DProjLod(sS21;vf4;f1; (global 4-component vector of float)
0:204 textureProjLod (global 4-component vector of float)
0:204 's2DS' (uniform sampler2DShadow)
0:204 'v' (temp 4-component vector of float)
0:204 'f' (temp float)
0:206 move second child to first child (temp 4-component vector of float)
0:206 'v' (temp 4-component vector of float)
0:206 Function Call: texture1DGradARB(s11;f1;f1;f1; (global 4-component vector of float)
0:206 textureGrad (global 4-component vector of float)
0:206 's1D' (uniform sampler1D)
0:206 'f' (temp float)
0:206 'f' (temp float)
0:206 'f' (temp float)
0:207 move second child to first child (temp 4-component vector of float)
0:207 'v' (temp 4-component vector of float)
0:207 Function Call: texture2DProjGradARB(s21;vf4;vf2;vf2; (global 4-component vector of float)
0:207 textureProjGrad (global 4-component vector of float)
0:207 's2D' (uniform sampler2D)
0:207 'v' (temp 4-component vector of float)
0:207 'v2' (temp 2-component vector of float)
0:207 'v2' (temp 2-component vector of float)
0:208 move second child to first child (temp 4-component vector of float)
0:208 'v' (temp 4-component vector of float)
0:208 Function Call: shadow2DProjGradARB(sS21;vf4;vf2;vf2; (global 4-component vector of float)
0:208 textureProjGrad (global 4-component vector of float)
0:208 's2DS' (uniform sampler2DShadow)
0:208 'v' (temp 4-component vector of float)
0:208 'v2' (temp 2-component vector of float)
@@ -1123,7 +1123,7 @@ ERROR: node is still EOpNull!
0:217 Sequence
0:217 move second child to first child (temp 4-component vector of float)
0:217 'v' (temp 4-component vector of float)
0:217 Function Call: texture2DRect(sR21;vf2; (global 4-component vector of float)
0:217 texture (global 4-component vector of float)
0:217 's2DRbad' (uniform sampler2DRect)
0:217 'v2' (temp 2-component vector of float)
0:225 Function Definition: foo12111( (global void)
@@ -1131,32 +1131,32 @@ ERROR: node is still EOpNull!
0:? Sequence
0:231 move second child to first child (temp 4-component vector of float)
0:231 'v' (temp 4-component vector of float)
0:231 Function Call: texture2DRect(sR21;vf2; (global 4-component vector of float)
0:231 texture (global 4-component vector of float)
0:231 's2DR' (uniform sampler2DRect)
0:231 'v2' (temp 2-component vector of float)
0:232 move second child to first child (temp 4-component vector of float)
0:232 'v' (temp 4-component vector of float)
0:232 Function Call: texture2DRectProj(sR21;vf3; (global 4-component vector of float)
0:232 textureProj (global 4-component vector of float)
0:232 's2DR' (uniform sampler2DRect)
0:232 'v3' (temp 3-component vector of float)
0:233 move second child to first child (temp 4-component vector of float)
0:233 'v' (temp 4-component vector of float)
0:233 Function Call: texture2DRectProj(sR21;vf4; (global 4-component vector of float)
0:233 textureProj (global 4-component vector of float)
0:233 's2DR' (uniform sampler2DRect)
0:233 'v4' (temp 4-component vector of float)
0:234 move second child to first child (temp 4-component vector of float)
0:234 'v' (temp 4-component vector of float)
0:234 Function Call: shadow2DRect(sSR21;vf3; (global 4-component vector of float)
0:234 texture (global 4-component vector of float)
0:234 's2DRS' (uniform sampler2DRectShadow)
0:234 'v3' (temp 3-component vector of float)
0:235 move second child to first child (temp 4-component vector of float)
0:235 'v' (temp 4-component vector of float)
0:235 Function Call: shadow2DRectProj(sSR21;vf4; (global 4-component vector of float)
0:235 textureProj (global 4-component vector of float)
0:235 's2DRS' (uniform sampler2DRectShadow)
0:235 'v4' (temp 4-component vector of float)
0:237 move second child to first child (temp 4-component vector of float)
0:237 'v' (temp 4-component vector of float)
0:237 Function Call: shadow2DRectProjGradARB(sSR21;vf4;vf2;vf2; (global 4-component vector of float)
0:237 textureProjGrad (global 4-component vector of float)
0:237 's2DRS' (uniform sampler2DRectShadow)
0:237 'v' (temp 4-component vector of float)
0:237 'v2' (temp 2-component vector of float)