Finish implement GL_ARB_texture_lod; adding the 19 additional *ARB() built-ins to the 11 non-*ARB() that were already supported.

git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@27542 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
John Kessenich
2014-07-29 18:11:09 +00:00
parent 019a62b0ec
commit b9fc145387
4 changed files with 298 additions and 141 deletions

View File

@@ -46,9 +46,13 @@ ERROR: 0:184: 'texture2DLod' : required extension not requested: GL_ARB_shader_t
ERROR: 0:185: 'texture3DProjLod' : required extension not requested: GL_ARB_shader_texture_lod
ERROR: 0:186: 'texture1DProjLod' : required extension not requested: GL_ARB_shader_texture_lod
ERROR: 0:187: 'shadow2DProjLod' : required extension not requested: GL_ARB_shader_texture_lod
WARNING: 0:190: '#extension' : extension is only partially supported: GL_ARB_shader_texture_lod
ERROR: 0:203: 'sampler2DRect' : Reserved word.
ERROR: 48 compilation errors. No code generated.
ERROR: 0:189: 'texture1DGradARB' : required extension not requested: GL_ARB_shader_texture_lod
ERROR: 0:190: 'texture2DProjGradARB' : required extension not requested: GL_ARB_shader_texture_lod
ERROR: 0:191: 'shadow2DProjGradARB' : required extension not requested: GL_ARB_shader_texture_lod
ERROR: 0:209: 'shadow2DRectProjGradARB' : no matching overloaded function found
ERROR: 0:209: 'assign' : cannot convert from 'const float' to '4-component vector of float'
ERROR: 0:212: 'sampler2DRect' : Reserved word.
ERROR: 53 compilation errors. No code generated.
Shader version: 120
@@ -472,70 +476,120 @@ ERROR: node is still EOpNull!
0:187 's2DS' (uniform sampler2DShadow)
0:187 'v' (4-component vector of float)
0:187 'f' (float)
0:192 Function Definition: foo2324( (void)
0:192 Function Parameters:
0:189 move second child to first child (4-component vector of float)
0:189 'v' (4-component vector of float)
0:189 Function Call: texture1DGradARB(s11;f1;f1;f1; (4-component vector of float)
0:189 's1D' (uniform sampler1D)
0:189 'f' (float)
0:189 'f' (float)
0:189 'f' (float)
0:190 move second child to first child (4-component vector of float)
0:190 'v' (4-component vector of float)
0:190 Function Call: texture2DProjGradARB(s21;vf4;vf2;vf2; (4-component vector of float)
0:190 's2D' (uniform sampler2D)
0:190 'v' (4-component vector of float)
0:190 'v2' (2-component vector of float)
0:190 'v2' (2-component vector of float)
0:191 move second child to first child (4-component vector of float)
0:191 'v' (4-component vector of float)
0:191 Function Call: shadow2DProjGradARB(sS21;vf4;vf2;vf2; (4-component vector of float)
0:191 's2DS' (uniform sampler2DShadow)
0:191 'v' (4-component vector of float)
0:191 'v2' (2-component vector of float)
0:191 'v2' (2-component vector of float)
0:196 Function Definition: foo2324( (void)
0:196 Function Parameters:
0:? Sequence
0:197 move second child to first child (4-component vector of float)
0:197 'v' (4-component vector of float)
0:197 Function Call: texture2DLod(s21;vf2;f1; (4-component vector of float)
0:197 's2D' (uniform sampler2D)
0:197 'v2' (2-component vector of float)
0:197 'f' (float)
0:198 move second child to first child (4-component vector of float)
0:198 'v' (4-component vector of float)
0:198 Function Call: texture3DProjLod(s31;vf4;f1; (4-component vector of float)
0:198 's3D' (uniform sampler3D)
0:198 'v' (4-component vector of float)
0:198 'f' (float)
0:199 move second child to first child (4-component vector of float)
0:199 'v' (4-component vector of float)
0:199 Function Call: texture1DProjLod(s11;vf4;f1; (4-component vector of float)
0:199 's1D' (uniform sampler1D)
0:199 'v' (4-component vector of float)
0:199 'f' (float)
0:200 move second child to first child (4-component vector of float)
0:200 'v' (4-component vector of float)
0:200 Function Call: shadow2DProjLod(sS21;vf4;f1; (4-component vector of float)
0:200 's2DS' (uniform sampler2DShadow)
0:200 'v' (4-component vector of float)
0:200 'f' (float)
0:205 Function Definition: foo121111( (void)
0:205 Function Parameters:
0:? Sequence
0:208 Sequence
0:208 move second child to first child (4-component vector of float)
0:201 move second child to first child (4-component vector of float)
0:201 'v' (4-component vector of float)
0:201 Function Call: texture2DLod(s21;vf2;f1; (4-component vector of float)
0:201 's2D' (uniform sampler2D)
0:201 'v2' (2-component vector of float)
0:201 'f' (float)
0:202 move second child to first child (4-component vector of float)
0:202 'v' (4-component vector of float)
0:202 Function Call: texture3DProjLod(s31;vf4;f1; (4-component vector of float)
0:202 's3D' (uniform sampler3D)
0:202 'v' (4-component vector of float)
0:202 'f' (float)
0:203 move second child to first child (4-component vector of float)
0:203 'v' (4-component vector of float)
0:203 Function Call: texture1DProjLod(s11;vf4;f1; (4-component vector of float)
0:203 's1D' (uniform sampler1D)
0:203 'v' (4-component vector of float)
0:203 'f' (float)
0:204 move second child to first child (4-component vector of float)
0:204 'v' (4-component vector of float)
0:204 Function Call: shadow2DProjLod(sS21;vf4;f1; (4-component vector of float)
0:204 's2DS' (uniform sampler2DShadow)
0:204 'v' (4-component vector of float)
0:204 'f' (float)
0:206 move second child to first child (4-component vector of float)
0:206 'v' (4-component vector of float)
0:206 Function Call: texture1DGradARB(s11;f1;f1;f1; (4-component vector of float)
0:206 's1D' (uniform sampler1D)
0:206 'f' (float)
0:206 'f' (float)
0:206 'f' (float)
0:207 move second child to first child (4-component vector of float)
0:207 'v' (4-component vector of float)
0:207 Function Call: texture2DProjGradARB(s21;vf4;vf2;vf2; (4-component vector of float)
0:207 's2D' (uniform sampler2D)
0:207 'v' (4-component vector of float)
0:207 'v2' (2-component vector of float)
0:207 'v2' (2-component vector of float)
0:208 move second child to first child (4-component vector of float)
0:208 'v' (4-component vector of float)
0:208 Function Call: shadow2DProjGradARB(sS21;vf4;vf2;vf2; (4-component vector of float)
0:208 's2DS' (uniform sampler2DShadow)
0:208 'v' (4-component vector of float)
0:208 Function Call: texture2DRect(sR21;vf2; (4-component vector of float)
0:208 's2DRbad' (uniform sampler2DRect)
0:208 'v2' (2-component vector of float)
0:216 Function Definition: foo12111( (void)
0:216 Function Parameters:
0:208 'v2' (2-component vector of float)
0:208 'v2' (2-component vector of float)
0:209 'v' (4-component vector of float)
0:214 Function Definition: foo121111( (void)
0:214 Function Parameters:
0:? Sequence
0:222 move second child to first child (4-component vector of float)
0:222 'v' (4-component vector of float)
0:222 Function Call: texture2DRect(sR21;vf2; (4-component vector of float)
0:222 's2DR' (uniform sampler2DRect)
0:222 'v2' (2-component vector of float)
0:223 move second child to first child (4-component vector of float)
0:223 'v' (4-component vector of float)
0:223 Function Call: texture2DRectProj(sR21;vf3; (4-component vector of float)
0:223 's2DR' (uniform sampler2DRect)
0:223 'v3' (3-component vector of float)
0:224 move second child to first child (4-component vector of float)
0:224 'v' (4-component vector of float)
0:224 Function Call: texture2DRectProj(sR21;vf4; (4-component vector of float)
0:224 's2DR' (uniform sampler2DRect)
0:224 'v4' (4-component vector of float)
0:225 move second child to first child (4-component vector of float)
0:225 'v' (4-component vector of float)
0:225 Function Call: shadow2DRect(sSR21;vf3; (4-component vector of float)
0:225 's2DRS' (uniform sampler2DRectShadow)
0:225 'v3' (3-component vector of float)
0:226 move second child to first child (4-component vector of float)
0:226 'v' (4-component vector of float)
0:226 Function Call: shadow2DRectProj(sSR21;vf4; (4-component vector of float)
0:226 's2DRS' (uniform sampler2DRectShadow)
0:226 'v4' (4-component vector of float)
0:217 Sequence
0:217 move second child to first child (4-component vector of float)
0:217 'v' (4-component vector of float)
0:217 Function Call: texture2DRect(sR21;vf2; (4-component vector of float)
0:217 's2DRbad' (uniform sampler2DRect)
0:217 'v2' (2-component vector of float)
0:225 Function Definition: foo12111( (void)
0:225 Function Parameters:
0:? Sequence
0:231 move second child to first child (4-component vector of float)
0:231 'v' (4-component vector of float)
0:231 Function Call: texture2DRect(sR21;vf2; (4-component vector of float)
0:231 's2DR' (uniform sampler2DRect)
0:231 'v2' (2-component vector of float)
0:232 move second child to first child (4-component vector of float)
0:232 'v' (4-component vector of float)
0:232 Function Call: texture2DRectProj(sR21;vf3; (4-component vector of float)
0:232 's2DR' (uniform sampler2DRect)
0:232 'v3' (3-component vector of float)
0:233 move second child to first child (4-component vector of float)
0:233 'v' (4-component vector of float)
0:233 Function Call: texture2DRectProj(sR21;vf4; (4-component vector of float)
0:233 's2DR' (uniform sampler2DRect)
0:233 'v4' (4-component vector of float)
0:234 move second child to first child (4-component vector of float)
0:234 'v' (4-component vector of float)
0:234 Function Call: shadow2DRect(sSR21;vf3; (4-component vector of float)
0:234 's2DRS' (uniform sampler2DRectShadow)
0:234 'v3' (3-component vector of float)
0:235 move second child to first child (4-component vector of float)
0:235 'v' (4-component vector of float)
0:235 Function Call: shadow2DRectProj(sSR21;vf4; (4-component vector of float)
0:235 's2DRS' (uniform sampler2DRectShadow)
0:235 'v4' (4-component vector of float)
0:237 move second child to first child (4-component vector of float)
0:237 'v' (4-component vector of float)
0:237 Function Call: shadow2DRectProjGradARB(sSR21;vf4;vf2;vf2; (4-component vector of float)
0:237 's2DRS' (uniform sampler2DRectShadow)
0:237 'v' (4-component vector of float)
0:237 'v2' (2-component vector of float)
0:237 'v2' (2-component vector of float)
0:? Linker Objects
0:? 'lowp' (float)
0:? 'mediump' (float)
@@ -993,70 +1047,120 @@ ERROR: node is still EOpNull!
0:187 's2DS' (uniform sampler2DShadow)
0:187 'v' (4-component vector of float)
0:187 'f' (float)
0:192 Function Definition: foo2324( (void)
0:192 Function Parameters:
0:189 move second child to first child (4-component vector of float)
0:189 'v' (4-component vector of float)
0:189 Function Call: texture1DGradARB(s11;f1;f1;f1; (4-component vector of float)
0:189 's1D' (uniform sampler1D)
0:189 'f' (float)
0:189 'f' (float)
0:189 'f' (float)
0:190 move second child to first child (4-component vector of float)
0:190 'v' (4-component vector of float)
0:190 Function Call: texture2DProjGradARB(s21;vf4;vf2;vf2; (4-component vector of float)
0:190 's2D' (uniform sampler2D)
0:190 'v' (4-component vector of float)
0:190 'v2' (2-component vector of float)
0:190 'v2' (2-component vector of float)
0:191 move second child to first child (4-component vector of float)
0:191 'v' (4-component vector of float)
0:191 Function Call: shadow2DProjGradARB(sS21;vf4;vf2;vf2; (4-component vector of float)
0:191 's2DS' (uniform sampler2DShadow)
0:191 'v' (4-component vector of float)
0:191 'v2' (2-component vector of float)
0:191 'v2' (2-component vector of float)
0:196 Function Definition: foo2324( (void)
0:196 Function Parameters:
0:? Sequence
0:197 move second child to first child (4-component vector of float)
0:197 'v' (4-component vector of float)
0:197 Function Call: texture2DLod(s21;vf2;f1; (4-component vector of float)
0:197 's2D' (uniform sampler2D)
0:197 'v2' (2-component vector of float)
0:197 'f' (float)
0:198 move second child to first child (4-component vector of float)
0:198 'v' (4-component vector of float)
0:198 Function Call: texture3DProjLod(s31;vf4;f1; (4-component vector of float)
0:198 's3D' (uniform sampler3D)
0:198 'v' (4-component vector of float)
0:198 'f' (float)
0:199 move second child to first child (4-component vector of float)
0:199 'v' (4-component vector of float)
0:199 Function Call: texture1DProjLod(s11;vf4;f1; (4-component vector of float)
0:199 's1D' (uniform sampler1D)
0:199 'v' (4-component vector of float)
0:199 'f' (float)
0:200 move second child to first child (4-component vector of float)
0:200 'v' (4-component vector of float)
0:200 Function Call: shadow2DProjLod(sS21;vf4;f1; (4-component vector of float)
0:200 's2DS' (uniform sampler2DShadow)
0:200 'v' (4-component vector of float)
0:200 'f' (float)
0:205 Function Definition: foo121111( (void)
0:205 Function Parameters:
0:? Sequence
0:208 Sequence
0:208 move second child to first child (4-component vector of float)
0:201 move second child to first child (4-component vector of float)
0:201 'v' (4-component vector of float)
0:201 Function Call: texture2DLod(s21;vf2;f1; (4-component vector of float)
0:201 's2D' (uniform sampler2D)
0:201 'v2' (2-component vector of float)
0:201 'f' (float)
0:202 move second child to first child (4-component vector of float)
0:202 'v' (4-component vector of float)
0:202 Function Call: texture3DProjLod(s31;vf4;f1; (4-component vector of float)
0:202 's3D' (uniform sampler3D)
0:202 'v' (4-component vector of float)
0:202 'f' (float)
0:203 move second child to first child (4-component vector of float)
0:203 'v' (4-component vector of float)
0:203 Function Call: texture1DProjLod(s11;vf4;f1; (4-component vector of float)
0:203 's1D' (uniform sampler1D)
0:203 'v' (4-component vector of float)
0:203 'f' (float)
0:204 move second child to first child (4-component vector of float)
0:204 'v' (4-component vector of float)
0:204 Function Call: shadow2DProjLod(sS21;vf4;f1; (4-component vector of float)
0:204 's2DS' (uniform sampler2DShadow)
0:204 'v' (4-component vector of float)
0:204 'f' (float)
0:206 move second child to first child (4-component vector of float)
0:206 'v' (4-component vector of float)
0:206 Function Call: texture1DGradARB(s11;f1;f1;f1; (4-component vector of float)
0:206 's1D' (uniform sampler1D)
0:206 'f' (float)
0:206 'f' (float)
0:206 'f' (float)
0:207 move second child to first child (4-component vector of float)
0:207 'v' (4-component vector of float)
0:207 Function Call: texture2DProjGradARB(s21;vf4;vf2;vf2; (4-component vector of float)
0:207 's2D' (uniform sampler2D)
0:207 'v' (4-component vector of float)
0:207 'v2' (2-component vector of float)
0:207 'v2' (2-component vector of float)
0:208 move second child to first child (4-component vector of float)
0:208 'v' (4-component vector of float)
0:208 Function Call: shadow2DProjGradARB(sS21;vf4;vf2;vf2; (4-component vector of float)
0:208 's2DS' (uniform sampler2DShadow)
0:208 'v' (4-component vector of float)
0:208 Function Call: texture2DRect(sR21;vf2; (4-component vector of float)
0:208 's2DRbad' (uniform sampler2DRect)
0:208 'v2' (2-component vector of float)
0:216 Function Definition: foo12111( (void)
0:216 Function Parameters:
0:208 'v2' (2-component vector of float)
0:208 'v2' (2-component vector of float)
0:209 'v' (4-component vector of float)
0:214 Function Definition: foo121111( (void)
0:214 Function Parameters:
0:? Sequence
0:222 move second child to first child (4-component vector of float)
0:222 'v' (4-component vector of float)
0:222 Function Call: texture2DRect(sR21;vf2; (4-component vector of float)
0:222 's2DR' (uniform sampler2DRect)
0:222 'v2' (2-component vector of float)
0:223 move second child to first child (4-component vector of float)
0:223 'v' (4-component vector of float)
0:223 Function Call: texture2DRectProj(sR21;vf3; (4-component vector of float)
0:223 's2DR' (uniform sampler2DRect)
0:223 'v3' (3-component vector of float)
0:224 move second child to first child (4-component vector of float)
0:224 'v' (4-component vector of float)
0:224 Function Call: texture2DRectProj(sR21;vf4; (4-component vector of float)
0:224 's2DR' (uniform sampler2DRect)
0:224 'v4' (4-component vector of float)
0:225 move second child to first child (4-component vector of float)
0:225 'v' (4-component vector of float)
0:225 Function Call: shadow2DRect(sSR21;vf3; (4-component vector of float)
0:225 's2DRS' (uniform sampler2DRectShadow)
0:225 'v3' (3-component vector of float)
0:226 move second child to first child (4-component vector of float)
0:226 'v' (4-component vector of float)
0:226 Function Call: shadow2DRectProj(sSR21;vf4; (4-component vector of float)
0:226 's2DRS' (uniform sampler2DRectShadow)
0:226 'v4' (4-component vector of float)
0:217 Sequence
0:217 move second child to first child (4-component vector of float)
0:217 'v' (4-component vector of float)
0:217 Function Call: texture2DRect(sR21;vf2; (4-component vector of float)
0:217 's2DRbad' (uniform sampler2DRect)
0:217 'v2' (2-component vector of float)
0:225 Function Definition: foo12111( (void)
0:225 Function Parameters:
0:? Sequence
0:231 move second child to first child (4-component vector of float)
0:231 'v' (4-component vector of float)
0:231 Function Call: texture2DRect(sR21;vf2; (4-component vector of float)
0:231 's2DR' (uniform sampler2DRect)
0:231 'v2' (2-component vector of float)
0:232 move second child to first child (4-component vector of float)
0:232 'v' (4-component vector of float)
0:232 Function Call: texture2DRectProj(sR21;vf3; (4-component vector of float)
0:232 's2DR' (uniform sampler2DRect)
0:232 'v3' (3-component vector of float)
0:233 move second child to first child (4-component vector of float)
0:233 'v' (4-component vector of float)
0:233 Function Call: texture2DRectProj(sR21;vf4; (4-component vector of float)
0:233 's2DR' (uniform sampler2DRect)
0:233 'v4' (4-component vector of float)
0:234 move second child to first child (4-component vector of float)
0:234 'v' (4-component vector of float)
0:234 Function Call: shadow2DRect(sSR21;vf3; (4-component vector of float)
0:234 's2DRS' (uniform sampler2DRectShadow)
0:234 'v3' (3-component vector of float)
0:235 move second child to first child (4-component vector of float)
0:235 'v' (4-component vector of float)
0:235 Function Call: shadow2DRectProj(sSR21;vf4; (4-component vector of float)
0:235 's2DRS' (uniform sampler2DRectShadow)
0:235 'v4' (4-component vector of float)
0:237 move second child to first child (4-component vector of float)
0:237 'v' (4-component vector of float)
0:237 Function Call: shadow2DRectProjGradARB(sSR21;vf4;vf2;vf2; (4-component vector of float)
0:237 's2DRS' (uniform sampler2DRectShadow)
0:237 'v' (4-component vector of float)
0:237 'v2' (2-component vector of float)
0:237 'v2' (2-component vector of float)
0:? Linker Objects
0:? 'lowp' (float)
0:? 'mediump' (float)