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 /tests | |
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.
Diffstat (limited to 'tests')
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 e86cf3c5..c5c11a17 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 55f3aa14..284bba92 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 ae8a9910..44ddf785 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 cf7e97d4..059405cc 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 4cd8dd2f..095a4c23 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 857fa49a..c1fb1c1b 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 630d7cff..8114d714 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 b2948e46..d4554b92 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 4f272281..900732d6 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 88eaf251..430a566c 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 fdbcc851..2e733238 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 434b0c9f..7f5239ba 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 561beb22..1500d8d0 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 8c57d1cf..01e767c3 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 e9a2adcb..7288b19a 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 f785d57b..ad9c72c4 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 b7355abe..d8d09c29 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 d1719490..0c0a069e 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 81935b2c..5c071c0b 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 f28d2fd7..c86af509 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 95ebf038..c5ab4a2b 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 685900a1..3873816a 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 9d44daf5..bcdb7df8 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 8242eff8..af81cc31 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 f2e3decb..d9ac8d87 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 6e1bd84d..d79607e3 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 e50a3177..a8e3986e 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 430d52a1..a7dc81c9 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 ac7136bb..76ae8e37 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 8c099295..33427386 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 925cf35a..48df94a4 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 3f828a60..2672d78f 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 6e77064b..52633680 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 89805f73..eb5d986f 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 ffffc8be..e6fc67ae 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 38758416..38e9e098 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 8924722d..902f41ff 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 463245a2..2f1ae39a 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 ea5c9ed8..adf7a0ca 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 07465bfe..a4abc1bb 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 fb09d049..5117d81f 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 f2d18f95..1f567942 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 3aa79e81..d8f6160e 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 5b8cf582..19991a71 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 0822b7af..c0ad824d 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 2c55c915..5bfd3cf5 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 d0ced570..7b99bf9a 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 4801784d..6635a74e 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 e2f94596..e7265cad 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 76db2380..1e06f572 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 |