diff options
author | Ian Romanick <ian.d.romanick@intel.com> | 2011-07-27 16:00:05 -0700 |
---|---|---|
committer | Ian Romanick <ian.d.romanick@intel.com> | 2011-07-30 13:30:09 -0700 |
commit | 1116e4fb46145750fabc64720c155824007230da (patch) | |
tree | fbf4bf700d16ba6f480bb47ec3d404e866263238 | |
parent | 10c734b6a91bab7964675bdcbd23330aba24f250 (diff) |
glsl-1.20: Require OpenGL 2.1 for test that set non-square matrix uniforms
Those functions only exist in OpenGL 2.1 or later. This fixes crashes
on OpenGL implementations that advertise GLSL 1.20 on GL 2.0 or
earlier.
50 files changed, 132 insertions, 4 deletions
diff --git a/tests/spec/glsl-1.20/execution/fs-outerProduct-const-mat2x3-ivec.shader_test b/tests/spec/glsl-1.20/execution/fs-outerProduct-const-mat2x3-ivec.shader_test index e86cf3c54..c5c11a17e 100644 --- a/tests/spec/glsl-1.20/execution/fs-outerProduct-const-mat2x3-ivec.shader_test +++ b/tests/spec/glsl-1.20/execution/fs-outerProduct-const-mat2x3-ivec.shader_test @@ -1,5 +1,7 @@ [require] GLSL >= 1.20 +# glUniformMatrix2x3fv only exists in OpenGL 2.1 or later. +GL >= 2.1 [vertex shader] #version 120 diff --git a/tests/spec/glsl-1.20/execution/fs-outerProduct-const-mat2x3.shader_test b/tests/spec/glsl-1.20/execution/fs-outerProduct-const-mat2x3.shader_test index 55f3aa146..284bba92e 100644 --- a/tests/spec/glsl-1.20/execution/fs-outerProduct-const-mat2x3.shader_test +++ b/tests/spec/glsl-1.20/execution/fs-outerProduct-const-mat2x3.shader_test @@ -1,5 +1,7 @@ [require] GLSL >= 1.20 +# glUniformMatrix2x3fv only exists in OpenGL 2.1 or later. +GL >= 2.1 [vertex shader] #version 120 diff --git a/tests/spec/glsl-1.20/execution/fs-outerProduct-const-mat2x4-ivec.shader_test b/tests/spec/glsl-1.20/execution/fs-outerProduct-const-mat2x4-ivec.shader_test index ae8a99102..44ddf7854 100644 --- a/tests/spec/glsl-1.20/execution/fs-outerProduct-const-mat2x4-ivec.shader_test +++ b/tests/spec/glsl-1.20/execution/fs-outerProduct-const-mat2x4-ivec.shader_test @@ -1,5 +1,7 @@ [require] GLSL >= 1.20 +# glUniformMatrix2x4fv only exists in OpenGL 2.1 or later. +GL >= 2.1 [vertex shader] #version 120 diff --git a/tests/spec/glsl-1.20/execution/fs-outerProduct-const-mat2x4.shader_test b/tests/spec/glsl-1.20/execution/fs-outerProduct-const-mat2x4.shader_test index cf7e97d43..059405cc2 100644 --- a/tests/spec/glsl-1.20/execution/fs-outerProduct-const-mat2x4.shader_test +++ b/tests/spec/glsl-1.20/execution/fs-outerProduct-const-mat2x4.shader_test @@ -1,5 +1,7 @@ [require] GLSL >= 1.20 +# glUniformMatrix2x4fv only exists in OpenGL 2.1 or later. +GL >= 2.1 [vertex shader] #version 120 diff --git a/tests/spec/glsl-1.20/execution/fs-outerProduct-const-mat3x2-ivec.shader_test b/tests/spec/glsl-1.20/execution/fs-outerProduct-const-mat3x2-ivec.shader_test index 4cd8dd2f9..095a4c232 100644 --- a/tests/spec/glsl-1.20/execution/fs-outerProduct-const-mat3x2-ivec.shader_test +++ b/tests/spec/glsl-1.20/execution/fs-outerProduct-const-mat3x2-ivec.shader_test @@ -1,5 +1,7 @@ [require] GLSL >= 1.20 +# glUniformMatrix3x2fv only exists in OpenGL 2.1 or later. +GL >= 2.1 [vertex shader] #version 120 diff --git a/tests/spec/glsl-1.20/execution/fs-outerProduct-const-mat3x2.shader_test b/tests/spec/glsl-1.20/execution/fs-outerProduct-const-mat3x2.shader_test index 857fa49a6..c1fb1c1b1 100644 --- a/tests/spec/glsl-1.20/execution/fs-outerProduct-const-mat3x2.shader_test +++ b/tests/spec/glsl-1.20/execution/fs-outerProduct-const-mat3x2.shader_test @@ -1,5 +1,7 @@ [require] GLSL >= 1.20 +# glUniformMatrix3x2fv only exists in OpenGL 2.1 or later. +GL >= 2.1 [vertex shader] #version 120 diff --git a/tests/spec/glsl-1.20/execution/fs-outerProduct-const-mat3x4-ivec.shader_test b/tests/spec/glsl-1.20/execution/fs-outerProduct-const-mat3x4-ivec.shader_test index 630d7cff9..8114d7146 100644 --- a/tests/spec/glsl-1.20/execution/fs-outerProduct-const-mat3x4-ivec.shader_test +++ b/tests/spec/glsl-1.20/execution/fs-outerProduct-const-mat3x4-ivec.shader_test @@ -1,5 +1,7 @@ [require] GLSL >= 1.20 +# glUniformMatrix3x4fv only exists in OpenGL 2.1 or later. +GL >= 2.1 [vertex shader] #version 120 diff --git a/tests/spec/glsl-1.20/execution/fs-outerProduct-const-mat3x4.shader_test b/tests/spec/glsl-1.20/execution/fs-outerProduct-const-mat3x4.shader_test index b2948e46b..d4554b920 100644 --- a/tests/spec/glsl-1.20/execution/fs-outerProduct-const-mat3x4.shader_test +++ b/tests/spec/glsl-1.20/execution/fs-outerProduct-const-mat3x4.shader_test @@ -1,5 +1,7 @@ [require] GLSL >= 1.20 +# glUniformMatrix3x4fv only exists in OpenGL 2.1 or later. +GL >= 2.1 [vertex shader] #version 120 diff --git a/tests/spec/glsl-1.20/execution/fs-outerProduct-const-mat4x2-ivec.shader_test b/tests/spec/glsl-1.20/execution/fs-outerProduct-const-mat4x2-ivec.shader_test index 4f272281a..900732d68 100644 --- a/tests/spec/glsl-1.20/execution/fs-outerProduct-const-mat4x2-ivec.shader_test +++ b/tests/spec/glsl-1.20/execution/fs-outerProduct-const-mat4x2-ivec.shader_test @@ -1,5 +1,7 @@ [require] GLSL >= 1.20 +# glUniformMatrix4x2fv only exists in OpenGL 2.1 or later. +GL >= 2.1 [vertex shader] #version 120 diff --git a/tests/spec/glsl-1.20/execution/fs-outerProduct-const-mat4x2.shader_test b/tests/spec/glsl-1.20/execution/fs-outerProduct-const-mat4x2.shader_test index 88eaf251b..430a566c9 100644 --- a/tests/spec/glsl-1.20/execution/fs-outerProduct-const-mat4x2.shader_test +++ b/tests/spec/glsl-1.20/execution/fs-outerProduct-const-mat4x2.shader_test @@ -1,5 +1,7 @@ [require] GLSL >= 1.20 +# glUniformMatrix4x2fv only exists in OpenGL 2.1 or later. +GL >= 2.1 [vertex shader] #version 120 diff --git a/tests/spec/glsl-1.20/execution/fs-outerProduct-const-mat4x3-ivec.shader_test b/tests/spec/glsl-1.20/execution/fs-outerProduct-const-mat4x3-ivec.shader_test index fdbcc851f..2e7332385 100644 --- a/tests/spec/glsl-1.20/execution/fs-outerProduct-const-mat4x3-ivec.shader_test +++ b/tests/spec/glsl-1.20/execution/fs-outerProduct-const-mat4x3-ivec.shader_test @@ -1,5 +1,7 @@ [require] GLSL >= 1.20 +# glUniformMatrix4x3fv only exists in OpenGL 2.1 or later. +GL >= 2.1 [vertex shader] #version 120 diff --git a/tests/spec/glsl-1.20/execution/fs-outerProduct-const-mat4x3.shader_test b/tests/spec/glsl-1.20/execution/fs-outerProduct-const-mat4x3.shader_test index 434b0c9f3..7f5239ba6 100644 --- a/tests/spec/glsl-1.20/execution/fs-outerProduct-const-mat4x3.shader_test +++ b/tests/spec/glsl-1.20/execution/fs-outerProduct-const-mat4x3.shader_test @@ -1,5 +1,7 @@ [require] GLSL >= 1.20 +# glUniformMatrix4x3fv only exists in OpenGL 2.1 or later. +GL >= 2.1 [vertex shader] #version 120 diff --git a/tests/spec/glsl-1.20/execution/fs-outerProduct-mat2x3-ivec.shader_test b/tests/spec/glsl-1.20/execution/fs-outerProduct-mat2x3-ivec.shader_test index 561beb22a..1500d8d07 100644 --- a/tests/spec/glsl-1.20/execution/fs-outerProduct-mat2x3-ivec.shader_test +++ b/tests/spec/glsl-1.20/execution/fs-outerProduct-mat2x3-ivec.shader_test @@ -1,5 +1,7 @@ [require] GLSL >= 1.20 +# glUniformMatrix2x3fv only exists in OpenGL 2.1 or later. +GL >= 2.1 [vertex shader] #version 120 diff --git a/tests/spec/glsl-1.20/execution/fs-outerProduct-mat2x3.shader_test b/tests/spec/glsl-1.20/execution/fs-outerProduct-mat2x3.shader_test index 8c57d1cfa..01e767c3d 100644 --- a/tests/spec/glsl-1.20/execution/fs-outerProduct-mat2x3.shader_test +++ b/tests/spec/glsl-1.20/execution/fs-outerProduct-mat2x3.shader_test @@ -1,5 +1,7 @@ [require] GLSL >= 1.20 +# glUniformMatrix2x3fv only exists in OpenGL 2.1 or later. +GL >= 2.1 [vertex shader] #version 120 diff --git a/tests/spec/glsl-1.20/execution/fs-outerProduct-mat2x4-ivec.shader_test b/tests/spec/glsl-1.20/execution/fs-outerProduct-mat2x4-ivec.shader_test index e9a2adcb7..7288b19a6 100644 --- a/tests/spec/glsl-1.20/execution/fs-outerProduct-mat2x4-ivec.shader_test +++ b/tests/spec/glsl-1.20/execution/fs-outerProduct-mat2x4-ivec.shader_test @@ -1,5 +1,7 @@ [require] GLSL >= 1.20 +# glUniformMatrix2x4fv only exists in OpenGL 2.1 or later. +GL >= 2.1 [vertex shader] #version 120 diff --git a/tests/spec/glsl-1.20/execution/fs-outerProduct-mat2x4.shader_test b/tests/spec/glsl-1.20/execution/fs-outerProduct-mat2x4.shader_test index f785d57b7..ad9c72c4b 100644 --- a/tests/spec/glsl-1.20/execution/fs-outerProduct-mat2x4.shader_test +++ b/tests/spec/glsl-1.20/execution/fs-outerProduct-mat2x4.shader_test @@ -1,5 +1,7 @@ [require] GLSL >= 1.20 +# glUniformMatrix2x4fv only exists in OpenGL 2.1 or later. +GL >= 2.1 [vertex shader] #version 120 diff --git a/tests/spec/glsl-1.20/execution/fs-outerProduct-mat3x2-ivec.shader_test b/tests/spec/glsl-1.20/execution/fs-outerProduct-mat3x2-ivec.shader_test index b7355abeb..d8d09c297 100644 --- a/tests/spec/glsl-1.20/execution/fs-outerProduct-mat3x2-ivec.shader_test +++ b/tests/spec/glsl-1.20/execution/fs-outerProduct-mat3x2-ivec.shader_test @@ -1,5 +1,7 @@ [require] GLSL >= 1.20 +# glUniformMatrix3x2fv only exists in OpenGL 2.1 or later. +GL >= 2.1 [vertex shader] #version 120 diff --git a/tests/spec/glsl-1.20/execution/fs-outerProduct-mat3x2.shader_test b/tests/spec/glsl-1.20/execution/fs-outerProduct-mat3x2.shader_test index d17194908..0c0a069ed 100644 --- a/tests/spec/glsl-1.20/execution/fs-outerProduct-mat3x2.shader_test +++ b/tests/spec/glsl-1.20/execution/fs-outerProduct-mat3x2.shader_test @@ -1,5 +1,7 @@ [require] GLSL >= 1.20 +# glUniformMatrix3x2fv only exists in OpenGL 2.1 or later. +GL >= 2.1 [vertex shader] #version 120 diff --git a/tests/spec/glsl-1.20/execution/fs-outerProduct-mat3x4-ivec.shader_test b/tests/spec/glsl-1.20/execution/fs-outerProduct-mat3x4-ivec.shader_test index 81935b2c0..5c071c0b4 100644 --- a/tests/spec/glsl-1.20/execution/fs-outerProduct-mat3x4-ivec.shader_test +++ b/tests/spec/glsl-1.20/execution/fs-outerProduct-mat3x4-ivec.shader_test @@ -1,5 +1,7 @@ [require] GLSL >= 1.20 +# glUniformMatrix3x4fv only exists in OpenGL 2.1 or later. +GL >= 2.1 [vertex shader] #version 120 diff --git a/tests/spec/glsl-1.20/execution/fs-outerProduct-mat3x4.shader_test b/tests/spec/glsl-1.20/execution/fs-outerProduct-mat3x4.shader_test index f28d2fd71..c86af5090 100644 --- a/tests/spec/glsl-1.20/execution/fs-outerProduct-mat3x4.shader_test +++ b/tests/spec/glsl-1.20/execution/fs-outerProduct-mat3x4.shader_test @@ -1,5 +1,7 @@ [require] GLSL >= 1.20 +# glUniformMatrix3x4fv only exists in OpenGL 2.1 or later. +GL >= 2.1 [vertex shader] #version 120 diff --git a/tests/spec/glsl-1.20/execution/fs-outerProduct-mat4x2-ivec.shader_test b/tests/spec/glsl-1.20/execution/fs-outerProduct-mat4x2-ivec.shader_test index 95ebf0386..c5ab4a2b4 100644 --- a/tests/spec/glsl-1.20/execution/fs-outerProduct-mat4x2-ivec.shader_test +++ b/tests/spec/glsl-1.20/execution/fs-outerProduct-mat4x2-ivec.shader_test @@ -1,5 +1,7 @@ [require] GLSL >= 1.20 +# glUniformMatrix4x2fv only exists in OpenGL 2.1 or later. +GL >= 2.1 [vertex shader] #version 120 diff --git a/tests/spec/glsl-1.20/execution/fs-outerProduct-mat4x2.shader_test b/tests/spec/glsl-1.20/execution/fs-outerProduct-mat4x2.shader_test index 685900a16..3873816a2 100644 --- a/tests/spec/glsl-1.20/execution/fs-outerProduct-mat4x2.shader_test +++ b/tests/spec/glsl-1.20/execution/fs-outerProduct-mat4x2.shader_test @@ -1,5 +1,7 @@ [require] GLSL >= 1.20 +# glUniformMatrix4x2fv only exists in OpenGL 2.1 or later. +GL >= 2.1 [vertex shader] #version 120 diff --git a/tests/spec/glsl-1.20/execution/fs-outerProduct-mat4x3-ivec.shader_test b/tests/spec/glsl-1.20/execution/fs-outerProduct-mat4x3-ivec.shader_test index 9d44daf5e..bcdb7df89 100644 --- a/tests/spec/glsl-1.20/execution/fs-outerProduct-mat4x3-ivec.shader_test +++ b/tests/spec/glsl-1.20/execution/fs-outerProduct-mat4x3-ivec.shader_test @@ -1,5 +1,7 @@ [require] GLSL >= 1.20 +# glUniformMatrix4x3fv only exists in OpenGL 2.1 or later. +GL >= 2.1 [vertex shader] #version 120 diff --git a/tests/spec/glsl-1.20/execution/fs-outerProduct-mat4x3.shader_test b/tests/spec/glsl-1.20/execution/fs-outerProduct-mat4x3.shader_test index 8242eff8f..af81cc319 100644 --- a/tests/spec/glsl-1.20/execution/fs-outerProduct-mat4x3.shader_test +++ b/tests/spec/glsl-1.20/execution/fs-outerProduct-mat4x3.shader_test @@ -1,5 +1,7 @@ [require] GLSL >= 1.20 +# glUniformMatrix4x3fv only exists in OpenGL 2.1 or later. +GL >= 2.1 [vertex shader] #version 120 diff --git a/tests/spec/glsl-1.20/execution/outerProduct-const.sh b/tests/spec/glsl-1.20/execution/outerProduct-const.sh index f2e3decb7..d9ac8d874 100755 --- a/tests/spec/glsl-1.20/execution/outerProduct-const.sh +++ b/tests/spec/glsl-1.20/execution/outerProduct-const.sh @@ -87,10 +87,18 @@ function emit_vs_test name="vs-outerProduct-const-${mat}.shader_test" fi + if [ $c -ne $r ]; then + GL_require="# glUniformMatrix${r}x${c}fv only exists in OpenGL 2.1 or later. +GL >= 2.1 +" + else + GL_require="" + fi + cat > $name <<EOF [require] GLSL >= 1.20 - +$GL_require [vertex shader] EOF @@ -138,10 +146,18 @@ function emit_fs_test name="fs-outerProduct-const-${mat}.shader_test" fi + if [ $c -ne $r ]; then + GL_require="# glUniformMatrix${r}x${c}fv only exists in OpenGL 2.1 or later. +GL >= 2.1 +" + else + GL_require="" + fi + cat > $name <<EOF [require] GLSL >= 1.20 - +$GL_require [vertex shader] #version 120 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } diff --git a/tests/spec/glsl-1.20/execution/outerProduct.sh b/tests/spec/glsl-1.20/execution/outerProduct.sh index 6e1bd84df..d79607e39 100755 --- a/tests/spec/glsl-1.20/execution/outerProduct.sh +++ b/tests/spec/glsl-1.20/execution/outerProduct.sh @@ -77,10 +77,18 @@ function emit_vs_test name="vs-outerProduct-${mat}.shader_test" fi + if [ $c -ne $r ]; then + GL_require="# glUniformMatrix${r}x${c}fv only exists in OpenGL 2.1 or later. +GL >= 2.1 +" + else + GL_require="" + fi + cat > $name <<EOF [require] GLSL >= 1.20 - +$GL_require [vertex shader] EOF @@ -131,10 +139,18 @@ function emit_fs_test name="fs-outerProduct-${mat}.shader_test" fi + if [ $c -ne $r ]; then + GL_require="# glUniformMatrix${r}x${c}fv only exists in OpenGL 2.1 or later. +GL >= 2.1 +" + else + GL_require="" + fi + cat > $name <<EOF [require] GLSL >= 1.20 - +$GL_require [vertex shader] #version 120 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } diff --git a/tests/spec/glsl-1.20/execution/vs-outerProduct-const-mat2x3-ivec.shader_test b/tests/spec/glsl-1.20/execution/vs-outerProduct-const-mat2x3-ivec.shader_test index e50a3177d..a8e3986e3 100644 --- a/tests/spec/glsl-1.20/execution/vs-outerProduct-const-mat2x3-ivec.shader_test +++ b/tests/spec/glsl-1.20/execution/vs-outerProduct-const-mat2x3-ivec.shader_test @@ -1,5 +1,7 @@ [require] GLSL >= 1.20 +# glUniformMatrix2x3fv only exists in OpenGL 2.1 or later. +GL >= 2.1 [vertex shader] /* From page 43 (page 49 of the PDF) of the GLSL 1.20 spec: diff --git a/tests/spec/glsl-1.20/execution/vs-outerProduct-const-mat2x3.shader_test b/tests/spec/glsl-1.20/execution/vs-outerProduct-const-mat2x3.shader_test index 430d52a19..a7dc81c98 100644 --- a/tests/spec/glsl-1.20/execution/vs-outerProduct-const-mat2x3.shader_test +++ b/tests/spec/glsl-1.20/execution/vs-outerProduct-const-mat2x3.shader_test @@ -1,5 +1,7 @@ [require] GLSL >= 1.20 +# glUniformMatrix2x3fv only exists in OpenGL 2.1 or later. +GL >= 2.1 [vertex shader] #version 120 diff --git a/tests/spec/glsl-1.20/execution/vs-outerProduct-const-mat2x4-ivec.shader_test b/tests/spec/glsl-1.20/execution/vs-outerProduct-const-mat2x4-ivec.shader_test index ac7136bb8..76ae8e376 100644 --- a/tests/spec/glsl-1.20/execution/vs-outerProduct-const-mat2x4-ivec.shader_test +++ b/tests/spec/glsl-1.20/execution/vs-outerProduct-const-mat2x4-ivec.shader_test @@ -1,5 +1,7 @@ [require] GLSL >= 1.20 +# glUniformMatrix2x4fv only exists in OpenGL 2.1 or later. +GL >= 2.1 [vertex shader] /* From page 43 (page 49 of the PDF) of the GLSL 1.20 spec: diff --git a/tests/spec/glsl-1.20/execution/vs-outerProduct-const-mat2x4.shader_test b/tests/spec/glsl-1.20/execution/vs-outerProduct-const-mat2x4.shader_test index 8c0992952..33427386a 100644 --- a/tests/spec/glsl-1.20/execution/vs-outerProduct-const-mat2x4.shader_test +++ b/tests/spec/glsl-1.20/execution/vs-outerProduct-const-mat2x4.shader_test @@ -1,5 +1,7 @@ [require] GLSL >= 1.20 +# glUniformMatrix2x4fv only exists in OpenGL 2.1 or later. +GL >= 2.1 [vertex shader] #version 120 diff --git a/tests/spec/glsl-1.20/execution/vs-outerProduct-const-mat3x2-ivec.shader_test b/tests/spec/glsl-1.20/execution/vs-outerProduct-const-mat3x2-ivec.shader_test index 925cf35ac..48df94a41 100644 --- a/tests/spec/glsl-1.20/execution/vs-outerProduct-const-mat3x2-ivec.shader_test +++ b/tests/spec/glsl-1.20/execution/vs-outerProduct-const-mat3x2-ivec.shader_test @@ -1,5 +1,7 @@ [require] GLSL >= 1.20 +# glUniformMatrix3x2fv only exists in OpenGL 2.1 or later. +GL >= 2.1 [vertex shader] /* From page 43 (page 49 of the PDF) of the GLSL 1.20 spec: diff --git a/tests/spec/glsl-1.20/execution/vs-outerProduct-const-mat3x2.shader_test b/tests/spec/glsl-1.20/execution/vs-outerProduct-const-mat3x2.shader_test index 3f828a608..2672d78f4 100644 --- a/tests/spec/glsl-1.20/execution/vs-outerProduct-const-mat3x2.shader_test +++ b/tests/spec/glsl-1.20/execution/vs-outerProduct-const-mat3x2.shader_test @@ -1,5 +1,7 @@ [require] GLSL >= 1.20 +# glUniformMatrix3x2fv only exists in OpenGL 2.1 or later. +GL >= 2.1 [vertex shader] #version 120 diff --git a/tests/spec/glsl-1.20/execution/vs-outerProduct-const-mat3x4-ivec.shader_test b/tests/spec/glsl-1.20/execution/vs-outerProduct-const-mat3x4-ivec.shader_test index 6e77064b7..52633680a 100644 --- a/tests/spec/glsl-1.20/execution/vs-outerProduct-const-mat3x4-ivec.shader_test +++ b/tests/spec/glsl-1.20/execution/vs-outerProduct-const-mat3x4-ivec.shader_test @@ -1,5 +1,7 @@ [require] GLSL >= 1.20 +# glUniformMatrix3x4fv only exists in OpenGL 2.1 or later. +GL >= 2.1 [vertex shader] /* From page 43 (page 49 of the PDF) of the GLSL 1.20 spec: diff --git a/tests/spec/glsl-1.20/execution/vs-outerProduct-const-mat3x4.shader_test b/tests/spec/glsl-1.20/execution/vs-outerProduct-const-mat3x4.shader_test index 89805f73e..eb5d986fc 100644 --- a/tests/spec/glsl-1.20/execution/vs-outerProduct-const-mat3x4.shader_test +++ b/tests/spec/glsl-1.20/execution/vs-outerProduct-const-mat3x4.shader_test @@ -1,5 +1,7 @@ [require] GLSL >= 1.20 +# glUniformMatrix3x4fv only exists in OpenGL 2.1 or later. +GL >= 2.1 [vertex shader] #version 120 diff --git a/tests/spec/glsl-1.20/execution/vs-outerProduct-const-mat4x2-ivec.shader_test b/tests/spec/glsl-1.20/execution/vs-outerProduct-const-mat4x2-ivec.shader_test index ffffc8be7..e6fc67ae9 100644 --- a/tests/spec/glsl-1.20/execution/vs-outerProduct-const-mat4x2-ivec.shader_test +++ b/tests/spec/glsl-1.20/execution/vs-outerProduct-const-mat4x2-ivec.shader_test @@ -1,5 +1,7 @@ [require] GLSL >= 1.20 +# glUniformMatrix4x2fv only exists in OpenGL 2.1 or later. +GL >= 2.1 [vertex shader] /* From page 43 (page 49 of the PDF) of the GLSL 1.20 spec: diff --git a/tests/spec/glsl-1.20/execution/vs-outerProduct-const-mat4x2.shader_test b/tests/spec/glsl-1.20/execution/vs-outerProduct-const-mat4x2.shader_test index 387584161..38e9e0980 100644 --- a/tests/spec/glsl-1.20/execution/vs-outerProduct-const-mat4x2.shader_test +++ b/tests/spec/glsl-1.20/execution/vs-outerProduct-const-mat4x2.shader_test @@ -1,5 +1,7 @@ [require] GLSL >= 1.20 +# glUniformMatrix4x2fv only exists in OpenGL 2.1 or later. +GL >= 2.1 [vertex shader] #version 120 diff --git a/tests/spec/glsl-1.20/execution/vs-outerProduct-const-mat4x3-ivec.shader_test b/tests/spec/glsl-1.20/execution/vs-outerProduct-const-mat4x3-ivec.shader_test index 8924722db..902f41ff0 100644 --- a/tests/spec/glsl-1.20/execution/vs-outerProduct-const-mat4x3-ivec.shader_test +++ b/tests/spec/glsl-1.20/execution/vs-outerProduct-const-mat4x3-ivec.shader_test @@ -1,5 +1,7 @@ [require] GLSL >= 1.20 +# glUniformMatrix4x3fv only exists in OpenGL 2.1 or later. +GL >= 2.1 [vertex shader] /* From page 43 (page 49 of the PDF) of the GLSL 1.20 spec: diff --git a/tests/spec/glsl-1.20/execution/vs-outerProduct-const-mat4x3.shader_test b/tests/spec/glsl-1.20/execution/vs-outerProduct-const-mat4x3.shader_test index 463245a27..2f1ae39a1 100644 --- a/tests/spec/glsl-1.20/execution/vs-outerProduct-const-mat4x3.shader_test +++ b/tests/spec/glsl-1.20/execution/vs-outerProduct-const-mat4x3.shader_test @@ -1,5 +1,7 @@ [require] GLSL >= 1.20 +# glUniformMatrix4x3fv only exists in OpenGL 2.1 or later. +GL >= 2.1 [vertex shader] #version 120 diff --git a/tests/spec/glsl-1.20/execution/vs-outerProduct-mat2x3-ivec.shader_test b/tests/spec/glsl-1.20/execution/vs-outerProduct-mat2x3-ivec.shader_test index ea5c9ed80..adf7a0ca5 100644 --- a/tests/spec/glsl-1.20/execution/vs-outerProduct-mat2x3-ivec.shader_test +++ b/tests/spec/glsl-1.20/execution/vs-outerProduct-mat2x3-ivec.shader_test @@ -1,5 +1,7 @@ [require] GLSL >= 1.20 +# glUniformMatrix2x3fv only exists in OpenGL 2.1 or later. +GL >= 2.1 [vertex shader] /* From page 43 (page 49 of the PDF) of the GLSL 1.20 spec: diff --git a/tests/spec/glsl-1.20/execution/vs-outerProduct-mat2x3.shader_test b/tests/spec/glsl-1.20/execution/vs-outerProduct-mat2x3.shader_test index 07465bfe6..a4abc1bbb 100644 --- a/tests/spec/glsl-1.20/execution/vs-outerProduct-mat2x3.shader_test +++ b/tests/spec/glsl-1.20/execution/vs-outerProduct-mat2x3.shader_test @@ -1,5 +1,7 @@ [require] GLSL >= 1.20 +# glUniformMatrix2x3fv only exists in OpenGL 2.1 or later. +GL >= 2.1 [vertex shader] #version 120 diff --git a/tests/spec/glsl-1.20/execution/vs-outerProduct-mat2x4-ivec.shader_test b/tests/spec/glsl-1.20/execution/vs-outerProduct-mat2x4-ivec.shader_test index fb09d0497..5117d81f1 100644 --- a/tests/spec/glsl-1.20/execution/vs-outerProduct-mat2x4-ivec.shader_test +++ b/tests/spec/glsl-1.20/execution/vs-outerProduct-mat2x4-ivec.shader_test @@ -1,5 +1,7 @@ [require] GLSL >= 1.20 +# glUniformMatrix2x4fv only exists in OpenGL 2.1 or later. +GL >= 2.1 [vertex shader] /* From page 43 (page 49 of the PDF) of the GLSL 1.20 spec: diff --git a/tests/spec/glsl-1.20/execution/vs-outerProduct-mat2x4.shader_test b/tests/spec/glsl-1.20/execution/vs-outerProduct-mat2x4.shader_test index f2d18f958..1f5679421 100644 --- a/tests/spec/glsl-1.20/execution/vs-outerProduct-mat2x4.shader_test +++ b/tests/spec/glsl-1.20/execution/vs-outerProduct-mat2x4.shader_test @@ -1,5 +1,7 @@ [require] GLSL >= 1.20 +# glUniformMatrix2x4fv only exists in OpenGL 2.1 or later. +GL >= 2.1 [vertex shader] #version 120 diff --git a/tests/spec/glsl-1.20/execution/vs-outerProduct-mat3x2-ivec.shader_test b/tests/spec/glsl-1.20/execution/vs-outerProduct-mat3x2-ivec.shader_test index 3aa79e81e..d8f6160e7 100644 --- a/tests/spec/glsl-1.20/execution/vs-outerProduct-mat3x2-ivec.shader_test +++ b/tests/spec/glsl-1.20/execution/vs-outerProduct-mat3x2-ivec.shader_test @@ -1,5 +1,7 @@ [require] GLSL >= 1.20 +# glUniformMatrix3x2fv only exists in OpenGL 2.1 or later. +GL >= 2.1 [vertex shader] /* From page 43 (page 49 of the PDF) of the GLSL 1.20 spec: diff --git a/tests/spec/glsl-1.20/execution/vs-outerProduct-mat3x2.shader_test b/tests/spec/glsl-1.20/execution/vs-outerProduct-mat3x2.shader_test index 5b8cf5826..19991a715 100644 --- a/tests/spec/glsl-1.20/execution/vs-outerProduct-mat3x2.shader_test +++ b/tests/spec/glsl-1.20/execution/vs-outerProduct-mat3x2.shader_test @@ -1,5 +1,7 @@ [require] GLSL >= 1.20 +# glUniformMatrix3x2fv only exists in OpenGL 2.1 or later. +GL >= 2.1 [vertex shader] #version 120 diff --git a/tests/spec/glsl-1.20/execution/vs-outerProduct-mat3x4-ivec.shader_test b/tests/spec/glsl-1.20/execution/vs-outerProduct-mat3x4-ivec.shader_test index 0822b7af0..c0ad824dc 100644 --- a/tests/spec/glsl-1.20/execution/vs-outerProduct-mat3x4-ivec.shader_test +++ b/tests/spec/glsl-1.20/execution/vs-outerProduct-mat3x4-ivec.shader_test @@ -1,5 +1,7 @@ [require] GLSL >= 1.20 +# glUniformMatrix3x4fv only exists in OpenGL 2.1 or later. +GL >= 2.1 [vertex shader] /* From page 43 (page 49 of the PDF) of the GLSL 1.20 spec: diff --git a/tests/spec/glsl-1.20/execution/vs-outerProduct-mat3x4.shader_test b/tests/spec/glsl-1.20/execution/vs-outerProduct-mat3x4.shader_test index 2c55c915a..5bfd3cf5c 100644 --- a/tests/spec/glsl-1.20/execution/vs-outerProduct-mat3x4.shader_test +++ b/tests/spec/glsl-1.20/execution/vs-outerProduct-mat3x4.shader_test @@ -1,5 +1,7 @@ [require] GLSL >= 1.20 +# glUniformMatrix3x4fv only exists in OpenGL 2.1 or later. +GL >= 2.1 [vertex shader] #version 120 diff --git a/tests/spec/glsl-1.20/execution/vs-outerProduct-mat4x2-ivec.shader_test b/tests/spec/glsl-1.20/execution/vs-outerProduct-mat4x2-ivec.shader_test index d0ced570a..7b99bf9a9 100644 --- a/tests/spec/glsl-1.20/execution/vs-outerProduct-mat4x2-ivec.shader_test +++ b/tests/spec/glsl-1.20/execution/vs-outerProduct-mat4x2-ivec.shader_test @@ -1,5 +1,7 @@ [require] GLSL >= 1.20 +# glUniformMatrix4x2fv only exists in OpenGL 2.1 or later. +GL >= 2.1 [vertex shader] /* From page 43 (page 49 of the PDF) of the GLSL 1.20 spec: diff --git a/tests/spec/glsl-1.20/execution/vs-outerProduct-mat4x2.shader_test b/tests/spec/glsl-1.20/execution/vs-outerProduct-mat4x2.shader_test index 4801784de..6635a74ed 100644 --- a/tests/spec/glsl-1.20/execution/vs-outerProduct-mat4x2.shader_test +++ b/tests/spec/glsl-1.20/execution/vs-outerProduct-mat4x2.shader_test @@ -1,5 +1,7 @@ [require] GLSL >= 1.20 +# glUniformMatrix4x2fv only exists in OpenGL 2.1 or later. +GL >= 2.1 [vertex shader] #version 120 diff --git a/tests/spec/glsl-1.20/execution/vs-outerProduct-mat4x3-ivec.shader_test b/tests/spec/glsl-1.20/execution/vs-outerProduct-mat4x3-ivec.shader_test index e2f945969..e7265cad7 100644 --- a/tests/spec/glsl-1.20/execution/vs-outerProduct-mat4x3-ivec.shader_test +++ b/tests/spec/glsl-1.20/execution/vs-outerProduct-mat4x3-ivec.shader_test @@ -1,5 +1,7 @@ [require] GLSL >= 1.20 +# glUniformMatrix4x3fv only exists in OpenGL 2.1 or later. +GL >= 2.1 [vertex shader] /* From page 43 (page 49 of the PDF) of the GLSL 1.20 spec: diff --git a/tests/spec/glsl-1.20/execution/vs-outerProduct-mat4x3.shader_test b/tests/spec/glsl-1.20/execution/vs-outerProduct-mat4x3.shader_test index 76db2380d..1e06f572c 100644 --- a/tests/spec/glsl-1.20/execution/vs-outerProduct-mat4x3.shader_test +++ b/tests/spec/glsl-1.20/execution/vs-outerProduct-mat4x3.shader_test @@ -1,5 +1,7 @@ [require] GLSL >= 1.20 +# glUniformMatrix4x3fv only exists in OpenGL 2.1 or later. +GL >= 2.1 [vertex shader] #version 120 |