diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2010-11-30 17:39:44 -0800 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2010-12-01 12:12:47 -0800 |
| commit | 38017752bca481d312de69cba5e334fd8c732a14 (patch) | |
| tree | 07b76720e3049365f695d5d76cd9b615406fe9fa | |
| parent | 467e6355113545de267615fc546a5bc5fd594194 (diff) | |
shader_runner: Use GLSL utility functions
This allows all the shader_runner tests to run on systems that have
the appropriate extensions but not OpenGL 2.0.
317 files changed, 55 insertions, 356 deletions
diff --git a/tests/shaders/glsl-algebraic-add-add-1.shader_test b/tests/shaders/glsl-algebraic-add-add-1.shader_test index 00771801..4ea6375d 100644 --- a/tests/shaders/glsl-algebraic-add-add-1.shader_test +++ b/tests/shaders/glsl-algebraic-add-add-1.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-algebraic-add-add-2.shader_test b/tests/shaders/glsl-algebraic-add-add-2.shader_test index 4f74082c..cb690939 100644 --- a/tests/shaders/glsl-algebraic-add-add-2.shader_test +++ b/tests/shaders/glsl-algebraic-add-add-2.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-algebraic-add-add-3.shader_test b/tests/shaders/glsl-algebraic-add-add-3.shader_test index e66caf0c..c9bb87ab 100644 --- a/tests/shaders/glsl-algebraic-add-add-3.shader_test +++ b/tests/shaders/glsl-algebraic-add-add-3.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-algebraic-add-add-4.shader_test b/tests/shaders/glsl-algebraic-add-add-4.shader_test index e9b9ca81..2785e9e0 100644 --- a/tests/shaders/glsl-algebraic-add-add-4.shader_test +++ b/tests/shaders/glsl-algebraic-add-add-4.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-algebraic-add-sub-1.shader_test b/tests/shaders/glsl-algebraic-add-sub-1.shader_test index d8013894..2f7d485d 100644 --- a/tests/shaders/glsl-algebraic-add-sub-1.shader_test +++ b/tests/shaders/glsl-algebraic-add-sub-1.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-algebraic-add-sub-2.shader_test b/tests/shaders/glsl-algebraic-add-sub-2.shader_test index a67b1ee0..7e5d6f1d 100644 --- a/tests/shaders/glsl-algebraic-add-sub-2.shader_test +++ b/tests/shaders/glsl-algebraic-add-sub-2.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-algebraic-add-zero-2.shader_test b/tests/shaders/glsl-algebraic-add-zero-2.shader_test index 72332f15..81905e6f 100644 --- a/tests/shaders/glsl-algebraic-add-zero-2.shader_test +++ b/tests/shaders/glsl-algebraic-add-zero-2.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-algebraic-add-zero.shader_test b/tests/shaders/glsl-algebraic-add-zero.shader_test index 00296824..e8967ea1 100644 --- a/tests/shaders/glsl-algebraic-add-zero.shader_test +++ b/tests/shaders/glsl-algebraic-add-zero.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-algebraic-div-one-2.shader_test b/tests/shaders/glsl-algebraic-div-one-2.shader_test index b1d71a6f..f6060886 100644 --- a/tests/shaders/glsl-algebraic-div-one-2.shader_test +++ b/tests/shaders/glsl-algebraic-div-one-2.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-algebraic-div-one.shader_test b/tests/shaders/glsl-algebraic-div-one.shader_test index 7b537793..b0e44e53 100644 --- a/tests/shaders/glsl-algebraic-div-one.shader_test +++ b/tests/shaders/glsl-algebraic-div-one.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-algebraic-logicand-false-2.shader_test b/tests/shaders/glsl-algebraic-logicand-false-2.shader_test index b6730f3c..e0d2fbbe 100644 --- a/tests/shaders/glsl-algebraic-logicand-false-2.shader_test +++ b/tests/shaders/glsl-algebraic-logicand-false-2.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-algebraic-logicand-false.shader_test b/tests/shaders/glsl-algebraic-logicand-false.shader_test index cc200bef..986cc6b3 100644 --- a/tests/shaders/glsl-algebraic-logicand-false.shader_test +++ b/tests/shaders/glsl-algebraic-logicand-false.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-algebraic-logicand-true-2.shader_test b/tests/shaders/glsl-algebraic-logicand-true-2.shader_test index b68a4ac7..c2cabe5f 100644 --- a/tests/shaders/glsl-algebraic-logicand-true-2.shader_test +++ b/tests/shaders/glsl-algebraic-logicand-true-2.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-algebraic-logicand-true.shader_test b/tests/shaders/glsl-algebraic-logicand-true.shader_test index 5612f175..30ff1855 100644 --- a/tests/shaders/glsl-algebraic-logicand-true.shader_test +++ b/tests/shaders/glsl-algebraic-logicand-true.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-algebraic-logicor-false-2.shader_test b/tests/shaders/glsl-algebraic-logicor-false-2.shader_test index d998f368..cf7c3f28 100644 --- a/tests/shaders/glsl-algebraic-logicor-false-2.shader_test +++ b/tests/shaders/glsl-algebraic-logicor-false-2.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-algebraic-logicor-false.shader_test b/tests/shaders/glsl-algebraic-logicor-false.shader_test index 94596e0d..d17795f4 100644 --- a/tests/shaders/glsl-algebraic-logicor-false.shader_test +++ b/tests/shaders/glsl-algebraic-logicor-false.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-algebraic-logicor-true-2.shader_test b/tests/shaders/glsl-algebraic-logicor-true-2.shader_test index dd771dbd..2bdc4654 100644 --- a/tests/shaders/glsl-algebraic-logicor-true-2.shader_test +++ b/tests/shaders/glsl-algebraic-logicor-true-2.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-algebraic-logicor-true.shader_test b/tests/shaders/glsl-algebraic-logicor-true.shader_test index 73508057..c219c227 100644 --- a/tests/shaders/glsl-algebraic-logicor-true.shader_test +++ b/tests/shaders/glsl-algebraic-logicor-true.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-algebraic-logicxor-false.shader_test b/tests/shaders/glsl-algebraic-logicxor-false.shader_test index 4914569a..6a720e12 100644 --- a/tests/shaders/glsl-algebraic-logicxor-false.shader_test +++ b/tests/shaders/glsl-algebraic-logicxor-false.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-algebraic-logicxor-true.shader_test b/tests/shaders/glsl-algebraic-logicxor-true.shader_test index 0f999a5d..7ac7fea3 100644 --- a/tests/shaders/glsl-algebraic-logicxor-true.shader_test +++ b/tests/shaders/glsl-algebraic-logicxor-true.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-algebraic-mul-mul-1.shader_test b/tests/shaders/glsl-algebraic-mul-mul-1.shader_test index d42f46c5..4fe18cbe 100644 --- a/tests/shaders/glsl-algebraic-mul-mul-1.shader_test +++ b/tests/shaders/glsl-algebraic-mul-mul-1.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-algebraic-mul-one-2.shader_test b/tests/shaders/glsl-algebraic-mul-one-2.shader_test index 1b269447..89ce35c3 100644 --- a/tests/shaders/glsl-algebraic-mul-one-2.shader_test +++ b/tests/shaders/glsl-algebraic-mul-one-2.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-algebraic-mul-one.shader_test b/tests/shaders/glsl-algebraic-mul-one.shader_test index 5575a801..6b46a4e8 100644 --- a/tests/shaders/glsl-algebraic-mul-one.shader_test +++ b/tests/shaders/glsl-algebraic-mul-one.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-algebraic-mul-zero.shader_test b/tests/shaders/glsl-algebraic-mul-zero.shader_test index bf3b178b..94b85e68 100644 --- a/tests/shaders/glsl-algebraic-mul-zero.shader_test +++ b/tests/shaders/glsl-algebraic-mul-zero.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-algebraic-neg-neg.shader_test b/tests/shaders/glsl-algebraic-neg-neg.shader_test index 749d8495..3b23e371 100644 --- a/tests/shaders/glsl-algebraic-neg-neg.shader_test +++ b/tests/shaders/glsl-algebraic-neg-neg.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-algebraic-not-equals.shader_test b/tests/shaders/glsl-algebraic-not-equals.shader_test index f99beca9..b6bec802 100644 --- a/tests/shaders/glsl-algebraic-not-equals.shader_test +++ b/tests/shaders/glsl-algebraic-not-equals.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-algebraic-not-notequals.shader_test b/tests/shaders/glsl-algebraic-not-notequals.shader_test index 95282d30..e8324aa9 100644 --- a/tests/shaders/glsl-algebraic-not-notequals.shader_test +++ b/tests/shaders/glsl-algebraic-not-notequals.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-algebraic-pow-two.shader_test b/tests/shaders/glsl-algebraic-pow-two.shader_test index 272a6a3d..d9d8d45a 100644 --- a/tests/shaders/glsl-algebraic-pow-two.shader_test +++ b/tests/shaders/glsl-algebraic-pow-two.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-algebraic-rcp-rcp.shader_test b/tests/shaders/glsl-algebraic-rcp-rcp.shader_test index d9309a52..1973bfd4 100644 --- a/tests/shaders/glsl-algebraic-rcp-rcp.shader_test +++ b/tests/shaders/glsl-algebraic-rcp-rcp.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-algebraic-rcp-rsq.shader_test b/tests/shaders/glsl-algebraic-rcp-rsq.shader_test index b2631235..550bb5e0 100644 --- a/tests/shaders/glsl-algebraic-rcp-rsq.shader_test +++ b/tests/shaders/glsl-algebraic-rcp-rsq.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-algebraic-rcp-sqrt-2.shader_test b/tests/shaders/glsl-algebraic-rcp-sqrt-2.shader_test index 95c3a784..c11a3064 100644 --- a/tests/shaders/glsl-algebraic-rcp-sqrt-2.shader_test +++ b/tests/shaders/glsl-algebraic-rcp-sqrt-2.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-algebraic-rcp-sqrt.shader_test b/tests/shaders/glsl-algebraic-rcp-sqrt.shader_test index 3ba6c0dc..abc2d06d 100644 --- a/tests/shaders/glsl-algebraic-rcp-sqrt.shader_test +++ b/tests/shaders/glsl-algebraic-rcp-sqrt.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-algebraic-sub-sub-1.shader_test b/tests/shaders/glsl-algebraic-sub-sub-1.shader_test index e586b5d6..d9c5ef7e 100644 --- a/tests/shaders/glsl-algebraic-sub-sub-1.shader_test +++ b/tests/shaders/glsl-algebraic-sub-sub-1.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-algebraic-sub-zero-2.shader_test b/tests/shaders/glsl-algebraic-sub-zero-2.shader_test index 9ed50a25..85c9d49a 100644 --- a/tests/shaders/glsl-algebraic-sub-zero-2.shader_test +++ b/tests/shaders/glsl-algebraic-sub-zero-2.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-algebraic-sub-zero-3.shader_test b/tests/shaders/glsl-algebraic-sub-zero-3.shader_test index bdd529cf..9489704c 100644 --- a/tests/shaders/glsl-algebraic-sub-zero-3.shader_test +++ b/tests/shaders/glsl-algebraic-sub-zero-3.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-algebraic-sub-zero-4.shader_test b/tests/shaders/glsl-algebraic-sub-zero-4.shader_test index 068020ac..a9ad4990 100644 --- a/tests/shaders/glsl-algebraic-sub-zero-4.shader_test +++ b/tests/shaders/glsl-algebraic-sub-zero-4.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-algebraic-sub-zero.shader_test b/tests/shaders/glsl-algebraic-sub-zero.shader_test index cd79b96d..f46d9e2e 100644 --- a/tests/shaders/glsl-algebraic-sub-zero.shader_test +++ b/tests/shaders/glsl-algebraic-sub-zero.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-array-bounds-01.shader_test b/tests/shaders/glsl-array-bounds-01.shader_test index ba1ed18c..82cf649f 100644 --- a/tests/shaders/glsl-array-bounds-01.shader_test +++ b/tests/shaders/glsl-array-bounds-01.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-array-bounds-02.shader_test b/tests/shaders/glsl-array-bounds-02.shader_test index 7e2cafc3..f5f90352 100644 --- a/tests/shaders/glsl-array-bounds-02.shader_test +++ b/tests/shaders/glsl-array-bounds-02.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-array-bounds-03.shader_test b/tests/shaders/glsl-array-bounds-03.shader_test index ce777934..210ea5cc 100644 --- a/tests/shaders/glsl-array-bounds-03.shader_test +++ b/tests/shaders/glsl-array-bounds-03.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader] diff --git a/tests/shaders/glsl-array-bounds-04.shader_test b/tests/shaders/glsl-array-bounds-04.shader_test index 76e52096..2c09b761 100644 --- a/tests/shaders/glsl-array-bounds-04.shader_test +++ b/tests/shaders/glsl-array-bounds-04.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader] diff --git a/tests/shaders/glsl-array-bounds-05.shader_test b/tests/shaders/glsl-array-bounds-05.shader_test index 0a386fd6..63db5c28 100644 --- a/tests/shaders/glsl-array-bounds-05.shader_test +++ b/tests/shaders/glsl-array-bounds-05.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-array-bounds-06.shader_test b/tests/shaders/glsl-array-bounds-06.shader_test index 97e5e4d0..2b87f0b0 100644 --- a/tests/shaders/glsl-array-bounds-06.shader_test +++ b/tests/shaders/glsl-array-bounds-06.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-array-bounds-07.shader_test b/tests/shaders/glsl-array-bounds-07.shader_test index fdf9dd2c..b42cbe26 100644 --- a/tests/shaders/glsl-array-bounds-07.shader_test +++ b/tests/shaders/glsl-array-bounds-07.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader] diff --git a/tests/shaders/glsl-array-bounds-08.shader_test b/tests/shaders/glsl-array-bounds-08.shader_test index a37f4b16..b3aaa016 100644 --- a/tests/shaders/glsl-array-bounds-08.shader_test +++ b/tests/shaders/glsl-array-bounds-08.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader] diff --git a/tests/shaders/glsl-array-length.shader_test b/tests/shaders/glsl-array-length.shader_test index 3518556e..ccf217d5 100644 --- a/tests/shaders/glsl-array-length.shader_test +++ b/tests/shaders/glsl-array-length.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-array-varying-01.shader_test b/tests/shaders/glsl-array-varying-01.shader_test index 5a576475..955743bb 100644 --- a/tests/shaders/glsl-array-varying-01.shader_test +++ b/tests/shaders/glsl-array-varying-01.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-bindattriblocation.c b/tests/shaders/glsl-bindattriblocation.c index adf97de5..58057a6b 100644 --- a/tests/shaders/glsl-bindattriblocation.c +++ b/tests/shaders/glsl-bindattriblocation.c @@ -68,19 +68,15 @@ piglit_display(void) GLint orig_attrib_loc, attrib_loc; enum piglit_result result; - vs = glCreateShader(GL_VERTEX_SHADER); - glShaderSource(vs, 1, &vertShaderText, NULL); - - glCompileShader(vs); - glGetShaderiv(vs, GL_COMPILE_STATUS, &stat); - if (!stat) { - fprintf(stderr, "glsl-bindattriblocation: error compiling vertex shader!\n"); + vs = piglit_compile_shader_text(GL_VERTEX_SHADER, vertShaderText); + if (vs == 0) { exit(1); } - prog = glCreateProgram(); - glAttachShader(prog, vs); - glLinkProgram(prog); + prog = piglit_link_simple_program(vs, 0); + if (prog == 0) { + exit(1); + } orig_attrib_loc = glGetAttribLocation(prog, "attrib"); if (!piglit_automatic) @@ -88,7 +84,7 @@ piglit_display(void) /* Bind "attrib" to location 3 and re-link */ glBindAttribLocation(prog, 3, "attrib"); - glLinkProgram(prog); + piglit_LinkProgram(prog); /* check that the bind worked */ attrib_loc = glGetAttribLocation(prog, "attrib"); @@ -102,7 +98,7 @@ piglit_display(void) } /* now draw something and check that it works */ - glUseProgram(prog); + piglit_UseProgram(prog); glMatrixMode(GL_PROJECTION); glLoadIdentity(); @@ -129,6 +125,8 @@ piglit_display(void) void piglit_init(int argc, char **argv) { + piglit_require_vertex_shader(); + if (!GLEW_VERSION_2_0) { printf("Requires OpenGL 2.0\n"); piglit_report_result(PIGLIT_SKIP); diff --git a/tests/shaders/glsl-const-builtin-abs.shader_test b/tests/shaders/glsl-const-builtin-abs.shader_test index 88fb2bbd..02ec3294 100644 --- a/tests/shaders/glsl-const-builtin-abs.shader_test +++ b/tests/shaders/glsl-const-builtin-abs.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-const-builtin-acos.shader_test b/tests/shaders/glsl-const-builtin-acos.shader_test index 0e29fa14..ef7b3296 100644 --- a/tests/shaders/glsl-const-builtin-acos.shader_test +++ b/tests/shaders/glsl-const-builtin-acos.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-const-builtin-all.shader_test b/tests/shaders/glsl-const-builtin-all.shader_test index 79a61aa3..ff5bf6fa 100644 --- a/tests/shaders/glsl-const-builtin-all.shader_test +++ b/tests/shaders/glsl-const-builtin-all.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-const-builtin-any.shader_test b/tests/shaders/glsl-const-builtin-any.shader_test index cb372266..ea6c1541 100644 --- a/tests/shaders/glsl-const-builtin-any.shader_test +++ b/tests/shaders/glsl-const-builtin-any.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-const-builtin-asin.shader_test b/tests/shaders/glsl-const-builtin-asin.shader_test index dd1ee4c0..8185d422 100644 --- a/tests/shaders/glsl-const-builtin-asin.shader_test +++ b/tests/shaders/glsl-const-builtin-asin.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-const-builtin-atan.shader_test b/tests/shaders/glsl-const-builtin-atan.shader_test index c81e5ce4..19cae64e 100644 --- a/tests/shaders/glsl-const-builtin-atan.shader_test +++ b/tests/shaders/glsl-const-builtin-atan.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-const-builtin-ceil.shader_test b/tests/shaders/glsl-const-builtin-ceil.shader_test index 9bfb3b53..60d01142 100644 --- a/tests/shaders/glsl-const-builtin-ceil.shader_test +++ b/tests/shaders/glsl-const-builtin-ceil.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-const-builtin-clamp.shader_test b/tests/shaders/glsl-const-builtin-clamp.shader_test index b111690d..7979f891 100644 --- a/tests/shaders/glsl-const-builtin-clamp.shader_test +++ b/tests/shaders/glsl-const-builtin-clamp.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-const-builtin-cos.shader_test b/tests/shaders/glsl-const-builtin-cos.shader_test index fe68baae..53aab1c7 100644 --- a/tests/shaders/glsl-const-builtin-cos.shader_test +++ b/tests/shaders/glsl-const-builtin-cos.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-const-builtin-cosh.shader_test b/tests/shaders/glsl-const-builtin-cosh.shader_test index 7a491caa..899cec9a 100644 --- a/tests/shaders/glsl-const-builtin-cosh.shader_test +++ b/tests/shaders/glsl-const-builtin-cosh.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.30 [vertex shader] diff --git a/tests/shaders/glsl-const-builtin-cross.shader_test b/tests/shaders/glsl-const-builtin-cross.shader_test index 70b99754..e83b78f2 100644 --- a/tests/shaders/glsl-const-builtin-cross.shader_test +++ b/tests/shaders/glsl-const-builtin-cross.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-const-builtin-degrees.shader_test b/tests/shaders/glsl-const-builtin-degrees.shader_test index 1017d35a..c2891460 100644 --- a/tests/shaders/glsl-const-builtin-degrees.shader_test +++ b/tests/shaders/glsl-const-builtin-degrees.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-const-builtin-derivatives.shader_test b/tests/shaders/glsl-const-builtin-derivatives.shader_test index 86051f79..29180cc3 100644 --- a/tests/shaders/glsl-const-builtin-derivatives.shader_test +++ b/tests/shaders/glsl-const-builtin-derivatives.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-const-builtin-distance.shader_test b/tests/shaders/glsl-const-builtin-distance.shader_test index 6cb5ba9e..904bb5b7 100644 --- a/tests/shaders/glsl-const-builtin-distance.shader_test +++ b/tests/shaders/glsl-const-builtin-distance.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-const-builtin-dot.shader_test b/tests/shaders/glsl-const-builtin-dot.shader_test index 4672bbfc..2f987c6f 100644 --- a/tests/shaders/glsl-const-builtin-dot.shader_test +++ b/tests/shaders/glsl-const-builtin-dot.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-const-builtin-equal-02.shader_test b/tests/shaders/glsl-const-builtin-equal-02.shader_test index 59b017c0..b0edc0ec 100644 --- a/tests/shaders/glsl-const-builtin-equal-02.shader_test +++ b/tests/shaders/glsl-const-builtin-equal-02.shader_test @@ -1,6 +1,5 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-const-builtin-equal-03.shader_test b/tests/shaders/glsl-const-builtin-equal-03.shader_test index d2518215..cea8fb38 100644 --- a/tests/shaders/glsl-const-builtin-equal-03.shader_test +++ b/tests/shaders/glsl-const-builtin-equal-03.shader_test @@ -1,6 +1,5 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-const-builtin-equal-04.shader_test b/tests/shaders/glsl-const-builtin-equal-04.shader_test index 979328e9..3686bb89 100644 --- a/tests/shaders/glsl-const-builtin-equal-04.shader_test +++ b/tests/shaders/glsl-const-builtin-equal-04.shader_test @@ -1,6 +1,5 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-const-builtin-equal-05.shader_test b/tests/shaders/glsl-const-builtin-equal-05.shader_test index ef7e3c27..ed5be856 100644 --- a/tests/shaders/glsl-const-builtin-equal-05.shader_test +++ b/tests/shaders/glsl-const-builtin-equal-05.shader_test @@ -1,6 +1,5 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-const-builtin-equal-06.shader_test b/tests/shaders/glsl-const-builtin-equal-06.shader_test index be30164d..2803bbdb 100644 --- a/tests/shaders/glsl-const-builtin-equal-06.shader_test +++ b/tests/shaders/glsl-const-builtin-equal-06.shader_test @@ -1,6 +1,5 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-const-builtin-equal-07.shader_test b/tests/shaders/glsl-const-builtin-equal-07.shader_test index b8d7ca7a..fec524cf 100644 --- a/tests/shaders/glsl-const-builtin-equal-07.shader_test +++ b/tests/shaders/glsl-const-builtin-equal-07.shader_test @@ -1,6 +1,5 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-const-builtin-equal-08.shader_test b/tests/shaders/glsl-const-builtin-equal-08.shader_test index 9c2bc590..f77af362 100644 --- a/tests/shaders/glsl-const-builtin-equal-08.shader_test +++ b/tests/shaders/glsl-const-builtin-equal-08.shader_test @@ -1,6 +1,5 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-const-builtin-equal-09.shader_test b/tests/shaders/glsl-const-builtin-equal-09.shader_test index d7d6d411..e0794825 100644 --- a/tests/shaders/glsl-const-builtin-equal-09.shader_test +++ b/tests/shaders/glsl-const-builtin-equal-09.shader_test @@ -1,6 +1,5 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-const-builtin-equal-10.shader_test b/tests/shaders/glsl-const-builtin-equal-10.shader_test index 13a0f515..18f61f86 100644 --- a/tests/shaders/glsl-const-builtin-equal-10.shader_test +++ b/tests/shaders/glsl-const-builtin-equal-10.shader_test @@ -1,6 +1,5 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-const-builtin-equal-bool.shader_test b/tests/shaders/glsl-const-builtin-equal-bool.shader_test index 6f7ffcba..62fd6293 100644 --- a/tests/shaders/glsl-const-builtin-equal-bool.shader_test +++ b/tests/shaders/glsl-const-builtin-equal-bool.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-const-builtin-equal.shader_test b/tests/shaders/glsl-const-builtin-equal.shader_test index d6e0e6a0..b6a71bf9 100644 --- a/tests/shaders/glsl-const-builtin-equal.shader_test +++ b/tests/shaders/glsl-const-builtin-equal.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-const-builtin-exp.shader_test b/tests/shaders/glsl-const-builtin-exp.shader_test index 92d3795f..46277d14 100644 --- a/tests/shaders/glsl-const-builtin-exp.shader_test +++ b/tests/shaders/glsl-const-builtin-exp.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-const-builtin-exp2.shader_test b/tests/shaders/glsl-const-builtin-exp2.shader_test index 4709181b..c1acf431 100644 --- a/tests/shaders/glsl-const-builtin-exp2.shader_test +++ b/tests/shaders/glsl-const-builtin-exp2.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-const-builtin-faceforward.shader_test b/tests/shaders/glsl-const-builtin-faceforward.shader_test index 4565dfc0..3d1d3d28 100644 --- a/tests/shaders/glsl-const-builtin-faceforward.shader_test +++ b/tests/shaders/glsl-const-builtin-faceforward.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-const-builtin-floor.shader_test b/tests/shaders/glsl-const-builtin-floor.shader_test index ff0ba01d..da677767 100644 --- a/tests/shaders/glsl-const-builtin-floor.shader_test +++ b/tests/shaders/glsl-const-builtin-floor.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-const-builtin-fract.shader_test b/tests/shaders/glsl-const-builtin-fract.shader_test index 9685fc8d..b8d11625 100644 --- a/tests/shaders/glsl-const-builtin-fract.shader_test +++ b/tests/shaders/glsl-const-builtin-fract.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-const-builtin-greaterThan.shader_test b/tests/shaders/glsl-const-builtin-greaterThan.shader_test index 9e42f976..0a40c091 100644 --- a/tests/shaders/glsl-const-builtin-greaterThan.shader_test +++ b/tests/shaders/glsl-const-builtin-greaterThan.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-const-builtin-greaterThanEqual.shader_test b/tests/shaders/glsl-const-builtin-greaterThanEqual.shader_test index 5a5c2408..f76e4b29 100644 --- a/tests/shaders/glsl-const-builtin-greaterThanEqual.shader_test +++ b/tests/shaders/glsl-const-builtin-greaterThanEqual.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-const-builtin-inversesqrt.shader_test b/tests/shaders/glsl-const-builtin-inversesqrt.shader_test index fc35e806..ba514697 100644 --- a/tests/shaders/glsl-const-builtin-inversesqrt.shader_test +++ b/tests/shaders/glsl-const-builtin-inversesqrt.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-const-builtin-length.shader_test b/tests/shaders/glsl-const-builtin-length.shader_test index 06731edb..0d333f12 100644 --- a/tests/shaders/glsl-const-builtin-length.shader_test +++ b/tests/shaders/glsl-const-builtin-length.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-const-builtin-lessThan.shader_test b/tests/shaders/glsl-const-builtin-lessThan.shader_test index 4baf2b83..883d3b5a 100644 --- a/tests/shaders/glsl-const-builtin-lessThan.shader_test +++ b/tests/shaders/glsl-const-builtin-lessThan.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-const-builtin-lessThanEqual.shader_test b/tests/shaders/glsl-const-builtin-lessThanEqual.shader_test index 66a82b62..c1bdd551 100644 --- a/tests/shaders/glsl-const-builtin-lessThanEqual.shader_test +++ b/tests/shaders/glsl-const-builtin-lessThanEqual.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-const-builtin-log.shader_test b/tests/shaders/glsl-const-builtin-log.shader_test index 8ae45f02..8e12a48a 100644 --- a/tests/shaders/glsl-const-builtin-log.shader_test +++ b/tests/shaders/glsl-const-builtin-log.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-const-builtin-log2.shader_test b/tests/shaders/glsl-const-builtin-log2.shader_test index 8d8048ea..f79bc610 100644 --- a/tests/shaders/glsl-const-builtin-log2.shader_test +++ b/tests/shaders/glsl-const-builtin-log2.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-const-builtin-matrixCompMult.shader_test b/tests/shaders/glsl-const-builtin-matrixCompMult.shader_test index 2029770f..e534885f 100644 --- a/tests/shaders/glsl-const-builtin-matrixCompMult.shader_test +++ b/tests/shaders/glsl-const-builtin-matrixCompMult.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-const-builtin-max.shader_test b/tests/shaders/glsl-const-builtin-max.shader_test index 62d32fc6..afffab5f 100644 --- a/tests/shaders/glsl-const-builtin-max.shader_test +++ b/tests/shaders/glsl-const-builtin-max.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-const-builtin-min.shader_test b/tests/shaders/glsl-const-builtin-min.shader_test index 6d2fc1c0..60f9866c 100644 --- a/tests/shaders/glsl-const-builtin-min.shader_test +++ b/tests/shaders/glsl-const-builtin-min.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-const-builtin-mix.shader_test b/tests/shaders/glsl-const-builtin-mix.shader_test index 70466f83..bf7b6efa 100644 --- a/tests/shaders/glsl-const-builtin-mix.shader_test +++ b/tests/shaders/glsl-const-builtin-mix.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-const-builtin-mod.shader_test b/tests/shaders/glsl-const-builtin-mod.shader_test index d49a034a..67e945a8 100644 --- a/tests/shaders/glsl-const-builtin-mod.shader_test +++ b/tests/shaders/glsl-const-builtin-mod.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-const-builtin-normalize.shader_test b/tests/shaders/glsl-const-builtin-normalize.shader_test index 6c1d1dff..f2d7fbfb 100644 --- a/tests/shaders/glsl-const-builtin-normalize.shader_test +++ b/tests/shaders/glsl-const-builtin-normalize.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-const-builtin-not.shader_test b/tests/shaders/glsl-const-builtin-not.shader_test index 14a50f29..f7af4dee 100644 --- a/tests/shaders/glsl-const-builtin-not.shader_test +++ b/tests/shaders/glsl-const-builtin-not.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-const-builtin-notEqual-02.shader_test b/tests/shaders/glsl-const-builtin-notEqual-02.shader_test index 9e78bb81..642c3092 100644 --- a/tests/shaders/glsl-const-builtin-notEqual-02.shader_test +++ b/tests/shaders/glsl-const-builtin-notEqual-02.shader_test @@ -1,6 +1,5 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-const-builtin-notEqual-03.shader_test b/tests/shaders/glsl-const-builtin-notEqual-03.shader_test index cc7bfe8e..7ce40c35 100644 --- a/tests/shaders/glsl-const-builtin-notEqual-03.shader_test +++ b/tests/shaders/glsl-const-builtin-notEqual-03.shader_test @@ -1,6 +1,5 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-const-builtin-notEqual-04.shader_test b/tests/shaders/glsl-const-builtin-notEqual-04.shader_test index 5aca53a0..a8dcd262 100644 --- a/tests/shaders/glsl-const-builtin-notEqual-04.shader_test +++ b/tests/shaders/glsl-const-builtin-notEqual-04.shader_test @@ -1,6 +1,5 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-const-builtin-notEqual-05.shader_test b/tests/shaders/glsl-const-builtin-notEqual-05.shader_test index b81ef3d7..f8b25682 100644 --- a/tests/shaders/glsl-const-builtin-notEqual-05.shader_test +++ b/tests/shaders/glsl-const-builtin-notEqual-05.shader_test @@ -1,6 +1,5 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-const-builtin-notEqual-06.shader_test b/tests/shaders/glsl-const-builtin-notEqual-06.shader_test index e9b0e0f3..1954d935 100644 --- a/tests/shaders/glsl-const-builtin-notEqual-06.shader_test +++ b/tests/shaders/glsl-const-builtin-notEqual-06.shader_test @@ -1,6 +1,5 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-const-builtin-notEqual-07.shader_test b/tests/shaders/glsl-const-builtin-notEqual-07.shader_test index 0f56d771..649076fa 100644 --- a/tests/shaders/glsl-const-builtin-notEqual-07.shader_test +++ b/tests/shaders/glsl-const-builtin-notEqual-07.shader_test @@ -1,6 +1,5 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-const-builtin-notEqual-08.shader_test b/tests/shaders/glsl-const-builtin-notEqual-08.shader_test index 775141e4..5a5a74c1 100644 --- a/tests/shaders/glsl-const-builtin-notEqual-08.shader_test +++ b/tests/shaders/glsl-const-builtin-notEqual-08.shader_test @@ -1,6 +1,5 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-const-builtin-notEqual-09.shader_test b/tests/shaders/glsl-const-builtin-notEqual-09.shader_test index 1f48f372..e149e653 100644 --- a/tests/shaders/glsl-const-builtin-notEqual-09.shader_test +++ b/tests/shaders/glsl-const-builtin-notEqual-09.shader_test @@ -1,6 +1,5 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-const-builtin-notEqual-10.shader_test b/tests/shaders/glsl-const-builtin-notEqual-10.shader_test index 1568b81d..2d5b4cd4 100644 --- a/tests/shaders/glsl-const-builtin-notEqual-10.shader_test +++ b/tests/shaders/glsl-const-builtin-notEqual-10.shader_test @@ -1,6 +1,5 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-const-builtin-notEqual-bool.shader_test b/tests/shaders/glsl-const-builtin-notEqual-bool.shader_test index 6a9e9104..6825c5d0 100644 --- a/tests/shaders/glsl-const-builtin-notEqual-bool.shader_test +++ b/tests/shaders/glsl-const-builtin-notEqual-bool.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-const-builtin-notEqual.shader_test b/tests/shaders/glsl-const-builtin-notEqual.shader_test index 44538f49..ff5fc6de 100644 --- a/tests/shaders/glsl-const-builtin-notEqual.shader_test +++ b/tests/shaders/glsl-const-builtin-notEqual.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-const-builtin-outerProduct.shader_test b/tests/shaders/glsl-const-builtin-outerProduct.shader_test index 7163d99b..a8e13b47 100644 --- a/tests/shaders/glsl-const-builtin-outerProduct.shader_test +++ b/tests/shaders/glsl-const-builtin-outerProduct.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-const-builtin-pow.shader_test b/tests/shaders/glsl-const-builtin-pow.shader_test index 83c9dbba..525c0e20 100644 --- a/tests/shaders/glsl-const-builtin-pow.shader_test +++ b/tests/shaders/glsl-const-builtin-pow.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-const-builtin-radians.shader_test b/tests/shaders/glsl-const-builtin-radians.shader_test index 5c31291b..a66c9a85 100644 --- a/tests/shaders/glsl-const-builtin-radians.shader_test +++ b/tests/shaders/glsl-const-builtin-radians.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-const-builtin-reflect.shader_test b/tests/shaders/glsl-const-builtin-reflect.shader_test index b1ddc843..a93cd605 100644 --- a/tests/shaders/glsl-const-builtin-reflect.shader_test +++ b/tests/shaders/glsl-const-builtin-reflect.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-const-builtin-refract.shader_test b/tests/shaders/glsl-const-builtin-refract.shader_test index 7cbd4747..5a7394e6 100644 --- a/tests/shaders/glsl-const-builtin-refract.shader_test +++ b/tests/shaders/glsl-const-builtin-refract.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-const-builtin-sign.shader_test b/tests/shaders/glsl-const-builtin-sign.shader_test index 95684f9a..6029f6a0 100644 --- a/tests/shaders/glsl-const-builtin-sign.shader_test +++ b/tests/shaders/glsl-const-builtin-sign.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-const-builtin-sin.shader_test b/tests/shaders/glsl-const-builtin-sin.shader_test index 26482adb..236271e6 100644 --- a/tests/shaders/glsl-const-builtin-sin.shader_test +++ b/tests/shaders/glsl-const-builtin-sin.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-const-builtin-smoothstep.shader_test b/tests/shaders/glsl-const-builtin-smoothstep.shader_test index 79e76435..e8e206d2 100644 --- a/tests/shaders/glsl-const-builtin-smoothstep.shader_test +++ b/tests/shaders/glsl-const-builtin-smoothstep.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-const-builtin-sqrt.shader_test b/tests/shaders/glsl-const-builtin-sqrt.shader_test index 69d1ea73..4465a192 100644 --- a/tests/shaders/glsl-const-builtin-sqrt.shader_test +++ b/tests/shaders/glsl-const-builtin-sqrt.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-const-builtin-step.shader_test b/tests/shaders/glsl-const-builtin-step.shader_test index 42d087ca..5818a20b 100644 --- a/tests/shaders/glsl-const-builtin-step.shader_test +++ b/tests/shaders/glsl-const-builtin-step.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-const-builtin-tan.shader_test b/tests/shaders/glsl-const-builtin-tan.shader_test index b2064a17..2cc750b5 100644 --- a/tests/shaders/glsl-const-builtin-tan.shader_test +++ b/tests/shaders/glsl-const-builtin-tan.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-const-builtin-transpose.shader_test b/tests/shaders/glsl-const-builtin-transpose.shader_test index a07708c6..09b17eb8 100644 --- a/tests/shaders/glsl-const-builtin-transpose.shader_test +++ b/tests/shaders/glsl-const-builtin-transpose.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-const-folding-01.shader_test b/tests/shaders/glsl-const-folding-01.shader_test index 441eaf52..e3424996 100644 --- a/tests/shaders/glsl-const-folding-01.shader_test +++ b/tests/shaders/glsl-const-folding-01.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-constant-folding-call-1.shader_test b/tests/shaders/glsl-constant-folding-call-1.shader_test index 354facf6..df29c1cc 100644 --- a/tests/shaders/glsl-constant-folding-call-1.shader_test +++ b/tests/shaders/glsl-constant-folding-call-1.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-copy-propagation-if-1.shader_test b/tests/shaders/glsl-copy-propagation-if-1.shader_test index a02b7bd6..a12bc6bd 100644 --- a/tests/shaders/glsl-copy-propagation-if-1.shader_test +++ b/tests/shaders/glsl-copy-propagation-if-1.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-copy-propagation-if-2.shader_test b/tests/shaders/glsl-copy-propagation-if-2.shader_test index 8b5204bb..8269c1e3 100644 --- a/tests/shaders/glsl-copy-propagation-if-2.shader_test +++ b/tests/shaders/glsl-copy-propagation-if-2.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-copy-propagation-if-3.shader_test b/tests/shaders/glsl-copy-propagation-if-3.shader_test index 22c23bc4..cdef7303 100644 --- a/tests/shaders/glsl-copy-propagation-if-3.shader_test +++ b/tests/shaders/glsl-copy-propagation-if-3.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-deadcode-call.shader_test b/tests/shaders/glsl-deadcode-call.shader_test index 42038013..c7b24807 100644 --- a/tests/shaders/glsl-deadcode-call.shader_test +++ b/tests/shaders/glsl-deadcode-call.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-deadcode-self-assign.shader_test b/tests/shaders/glsl-deadcode-self-assign.shader_test index 7a22c249..50540581 100644 --- a/tests/shaders/glsl-deadcode-self-assign.shader_test +++ b/tests/shaders/glsl-deadcode-self-assign.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-deadcode-varying.shader_test b/tests/shaders/glsl-deadcode-varying.shader_test index 1def3337..66a3b586 100644 --- a/tests/shaders/glsl-deadcode-varying.shader_test +++ b/tests/shaders/glsl-deadcode-varying.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-derivs-swizzle.shader_test b/tests/shaders/glsl-derivs-swizzle.shader_test index 78ca3bd6..aaad44f1 100644 --- a/tests/shaders/glsl-derivs-swizzle.shader_test +++ b/tests/shaders/glsl-derivs-swizzle.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-floating-constant-120.shader_test b/tests/shaders/glsl-floating-constant-120.shader_test index 9a0509ae..6695f79f 100644 --- a/tests/shaders/glsl-floating-constant-120.shader_test +++ b/tests/shaders/glsl-floating-constant-120.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader] diff --git a/tests/shaders/glsl-fs-abs-01.shader_test b/tests/shaders/glsl-fs-abs-01.shader_test index 423c4d10..0372cce1 100644 --- a/tests/shaders/glsl-fs-abs-01.shader_test +++ b/tests/shaders/glsl-fs-abs-01.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-fs-abs-02.shader_test b/tests/shaders/glsl-fs-abs-02.shader_test index b125ad16..72315f57 100644 --- a/tests/shaders/glsl-fs-abs-02.shader_test +++ b/tests/shaders/glsl-fs-abs-02.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-fs-abs-03.shader_test b/tests/shaders/glsl-fs-abs-03.shader_test index 6c197bdb..8212a803 100644 --- a/tests/shaders/glsl-fs-abs-03.shader_test +++ b/tests/shaders/glsl-fs-abs-03.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-fs-abs-04.shader_test b/tests/shaders/glsl-fs-abs-04.shader_test index c7e5aacf..64b88671 100644 --- a/tests/shaders/glsl-fs-abs-04.shader_test +++ b/tests/shaders/glsl-fs-abs-04.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-fs-add-masked.shader_test b/tests/shaders/glsl-fs-add-masked.shader_test index 845ca376..597a7f08 100644 --- a/tests/shaders/glsl-fs-add-masked.shader_test +++ b/tests/shaders/glsl-fs-add-masked.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-fs-all-01.shader_test b/tests/shaders/glsl-fs-all-01.shader_test index 49882cd5..7ef2b298 100644 --- a/tests/shaders/glsl-fs-all-01.shader_test +++ b/tests/shaders/glsl-fs-all-01.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-fs-all-02.shader_test b/tests/shaders/glsl-fs-all-02.shader_test index 8205a33b..5b46ca07 100644 --- a/tests/shaders/glsl-fs-all-02.shader_test +++ b/tests/shaders/glsl-fs-all-02.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-fs-any.shader_test b/tests/shaders/glsl-fs-any.shader_test index 58642a3e..454f7309 100644 --- a/tests/shaders/glsl-fs-any.shader_test +++ b/tests/shaders/glsl-fs-any.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader] diff --git a/tests/shaders/glsl-fs-asin.shader_test b/tests/shaders/glsl-fs-asin.shader_test index 12d6c2bf..9b53ea0c 100644 --- a/tests/shaders/glsl-fs-asin.shader_test +++ b/tests/shaders/glsl-fs-asin.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-fs-atan-1.shader_test b/tests/shaders/glsl-fs-atan-1.shader_test index c659ace0..e55c133d 100644 --- a/tests/shaders/glsl-fs-atan-1.shader_test +++ b/tests/shaders/glsl-fs-atan-1.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-fs-atan-2.shader_test b/tests/shaders/glsl-fs-atan-2.shader_test index c86f8e74..7744e943 100644 --- a/tests/shaders/glsl-fs-atan-2.shader_test +++ b/tests/shaders/glsl-fs-atan-2.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-fs-atan-3.shader_test b/tests/shaders/glsl-fs-atan-3.shader_test index 900af84d..8e996b36 100644 --- a/tests/shaders/glsl-fs-atan-3.shader_test +++ b/tests/shaders/glsl-fs-atan-3.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-fs-bit-01.shader_test b/tests/shaders/glsl-fs-bit-01.shader_test index 7a4e08f5..c9c37791 100644 --- a/tests/shaders/glsl-fs-bit-01.shader_test +++ b/tests/shaders/glsl-fs-bit-01.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.30 [vertex shader] diff --git a/tests/shaders/glsl-fs-bit-02.shader_test b/tests/shaders/glsl-fs-bit-02.shader_test index 56022416..7b3c5772 100644 --- a/tests/shaders/glsl-fs-bit-02.shader_test +++ b/tests/shaders/glsl-fs-bit-02.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.30 [vertex shader] diff --git a/tests/shaders/glsl-fs-ceil.shader_test b/tests/shaders/glsl-fs-ceil.shader_test index 93c06f81..faf356d1 100644 --- a/tests/shaders/glsl-fs-ceil.shader_test +++ b/tests/shaders/glsl-fs-ceil.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader file] diff --git a/tests/shaders/glsl-fs-clamp-1.shader_test b/tests/shaders/glsl-fs-clamp-1.shader_test index 12fc4b4e..3a2a4ac7 100644 --- a/tests/shaders/glsl-fs-clamp-1.shader_test +++ b/tests/shaders/glsl-fs-clamp-1.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-fs-conditional-output-write.shader_test b/tests/shaders/glsl-fs-conditional-output-write.shader_test index d3d7d800..a76e995f 100644 --- a/tests/shaders/glsl-fs-conditional-output-write.shader_test +++ b/tests/shaders/glsl-fs-conditional-output-write.shader_test @@ -1,6 +1,5 @@ # Bug #30415 [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-fs-convolution-1.shader_test b/tests/shaders/glsl-fs-convolution-1.shader_test index 1cb23f84..4095d782 100644 --- a/tests/shaders/glsl-fs-convolution-1.shader_test +++ b/tests/shaders/glsl-fs-convolution-1.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-fs-convolution-2.shader_test b/tests/shaders/glsl-fs-convolution-2.shader_test index a51e8851..9639b1a6 100644 --- a/tests/shaders/glsl-fs-convolution-2.shader_test +++ b/tests/shaders/glsl-fs-convolution-2.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-fs-copy-propagation-texcoords-1.shader_test b/tests/shaders/glsl-fs-copy-propagation-texcoords-1.shader_test index a8b0077c..07390fd6 100644 --- a/tests/shaders/glsl-fs-copy-propagation-texcoords-1.shader_test +++ b/tests/shaders/glsl-fs-copy-propagation-texcoords-1.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-fs-copy-propagation-texcoords-2.shader_test b/tests/shaders/glsl-fs-copy-propagation-texcoords-2.shader_test index 9797bde5..4b29d09b 100644 --- a/tests/shaders/glsl-fs-copy-propagation-texcoords-2.shader_test +++ b/tests/shaders/glsl-fs-copy-propagation-texcoords-2.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-fs-cross-2.shader_test b/tests/shaders/glsl-fs-cross-2.shader_test index 25cd5ca6..76aba02b 100644 --- a/tests/shaders/glsl-fs-cross-2.shader_test +++ b/tests/shaders/glsl-fs-cross-2.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-fs-cross-3.shader_test b/tests/shaders/glsl-fs-cross-3.shader_test index 0576be6c..aa4970f9 100644 --- a/tests/shaders/glsl-fs-cross-3.shader_test +++ b/tests/shaders/glsl-fs-cross-3.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-fs-cross.shader_test b/tests/shaders/glsl-fs-cross.shader_test index 04a99f7b..83454360 100644 --- a/tests/shaders/glsl-fs-cross.shader_test +++ b/tests/shaders/glsl-fs-cross.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-fs-discard-01.shader_test b/tests/shaders/glsl-fs-discard-01.shader_test index 4af75bdc..5b16318b 100644 --- a/tests/shaders/glsl-fs-discard-01.shader_test +++ b/tests/shaders/glsl-fs-discard-01.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader file] diff --git a/tests/shaders/glsl-fs-discard-03.shader_test b/tests/shaders/glsl-fs-discard-03.shader_test index e2b45dc4..fe51e29f 100644 --- a/tests/shaders/glsl-fs-discard-03.shader_test +++ b/tests/shaders/glsl-fs-discard-03.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-fs-dot-vec2-2.shader_test b/tests/shaders/glsl-fs-dot-vec2-2.shader_test index 7db5d52a..a749bf84 100644 --- a/tests/shaders/glsl-fs-dot-vec2-2.shader_test +++ b/tests/shaders/glsl-fs-dot-vec2-2.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-fs-dot-vec2.shader_test b/tests/shaders/glsl-fs-dot-vec2.shader_test index 17614b10..9ec6baf1 100644 --- a/tests/shaders/glsl-fs-dot-vec2.shader_test +++ b/tests/shaders/glsl-fs-dot-vec2.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-fs-exp.shader_test b/tests/shaders/glsl-fs-exp.shader_test index e6c85cd9..7be20894 100644 --- a/tests/shaders/glsl-fs-exp.shader_test +++ b/tests/shaders/glsl-fs-exp.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-fs-floor.shader_test b/tests/shaders/glsl-fs-floor.shader_test index 554f67f2..1d4da465 100644 --- a/tests/shaders/glsl-fs-floor.shader_test +++ b/tests/shaders/glsl-fs-floor.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader file] diff --git a/tests/shaders/glsl-fs-functions-2.shader_test b/tests/shaders/glsl-fs-functions-2.shader_test index d1c4fda9..957e042a 100644 --- a/tests/shaders/glsl-fs-functions-2.shader_test +++ b/tests/shaders/glsl-fs-functions-2.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-fs-functions-3.shader_test b/tests/shaders/glsl-fs-functions-3.shader_test index 6d746999..a107a2fe 100644 --- a/tests/shaders/glsl-fs-functions-3.shader_test +++ b/tests/shaders/glsl-fs-functions-3.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-fs-functions-4.shader_test b/tests/shaders/glsl-fs-functions-4.shader_test index a0acebf3..36cb2465 100644 --- a/tests/shaders/glsl-fs-functions-4.shader_test +++ b/tests/shaders/glsl-fs-functions-4.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-fs-functions-samplers.shader_test b/tests/shaders/glsl-fs-functions-samplers.shader_test index 2c3134db..2273bdd1 100644 --- a/tests/shaders/glsl-fs-functions-samplers.shader_test +++ b/tests/shaders/glsl-fs-functions-samplers.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-fs-i2b.shader_test b/tests/shaders/glsl-fs-i2b.shader_test index 1a385c9b..7caadf5d 100644 --- a/tests/shaders/glsl-fs-i2b.shader_test +++ b/tests/shaders/glsl-fs-i2b.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader] diff --git a/tests/shaders/glsl-fs-if-greater-equal.shader_test b/tests/shaders/glsl-fs-if-greater-equal.shader_test index 0e2f81ca..8b0794f5 100644 --- a/tests/shaders/glsl-fs-if-greater-equal.shader_test +++ b/tests/shaders/glsl-fs-if-greater-equal.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader file] diff --git a/tests/shaders/glsl-fs-if-greater.shader_test b/tests/shaders/glsl-fs-if-greater.shader_test index 9f09c0da..c70f9ed5 100644 --- a/tests/shaders/glsl-fs-if-greater.shader_test +++ b/tests/shaders/glsl-fs-if-greater.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader file] diff --git a/tests/shaders/glsl-fs-if-less-equal.shader_test b/tests/shaders/glsl-fs-if-less-equal.shader_test index 0f181bc5..bfcfd951 100644 --- a/tests/shaders/glsl-fs-if-less-equal.shader_test +++ b/tests/shaders/glsl-fs-if-less-equal.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader file] diff --git a/tests/shaders/glsl-fs-if-less.shader_test b/tests/shaders/glsl-fs-if-less.shader_test index 63e0b92e..ff927dd0 100644 --- a/tests/shaders/glsl-fs-if-less.shader_test +++ b/tests/shaders/glsl-fs-if-less.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader file] diff --git a/tests/shaders/glsl-fs-if-nested-loop.shader_test b/tests/shaders/glsl-fs-if-nested-loop.shader_test index a8dc9178..fc5c8519 100644 --- a/tests/shaders/glsl-fs-if-nested-loop.shader_test +++ b/tests/shaders/glsl-fs-if-nested-loop.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-fs-inline-explosion.shader_test b/tests/shaders/glsl-fs-inline-explosion.shader_test index 227012d7..144a98a7 100644 --- a/tests/shaders/glsl-fs-inline-explosion.shader_test +++ b/tests/shaders/glsl-fs-inline-explosion.shader_test @@ -1,6 +1,5 @@ // if you inline all functions indiscriminately, you won't pass this [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-fs-log.shader_test b/tests/shaders/glsl-fs-log.shader_test index fb639d2a..60719699 100644 --- a/tests/shaders/glsl-fs-log.shader_test +++ b/tests/shaders/glsl-fs-log.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-fs-log2.shader_test b/tests/shaders/glsl-fs-log2.shader_test index 67fa1070..c285e27f 100644 --- a/tests/shaders/glsl-fs-log2.shader_test +++ b/tests/shaders/glsl-fs-log2.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader file] diff --git a/tests/shaders/glsl-fs-loop-const-decr.shader_test b/tests/shaders/glsl-fs-loop-const-decr.shader_test index 91a647c0..ba27a8aa 100644 --- a/tests/shaders/glsl-fs-loop-const-decr.shader_test +++ b/tests/shaders/glsl-fs-loop-const-decr.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader file] diff --git a/tests/shaders/glsl-fs-loop-const-incr.shader_test b/tests/shaders/glsl-fs-loop-const-incr.shader_test index 3ebea359..d586e948 100644 --- a/tests/shaders/glsl-fs-loop-const-incr.shader_test +++ b/tests/shaders/glsl-fs-loop-const-incr.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader file] diff --git a/tests/shaders/glsl-fs-loop-ge.shader_test b/tests/shaders/glsl-fs-loop-ge.shader_test index 80e83198..523d01a4 100644 --- a/tests/shaders/glsl-fs-loop-ge.shader_test +++ b/tests/shaders/glsl-fs-loop-ge.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader file] diff --git a/tests/shaders/glsl-fs-loop-gt.shader_test b/tests/shaders/glsl-fs-loop-gt.shader_test index 7a7818ac..de167268 100644 --- a/tests/shaders/glsl-fs-loop-gt.shader_test +++ b/tests/shaders/glsl-fs-loop-gt.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader file] diff --git a/tests/shaders/glsl-fs-loop-le.shader_test b/tests/shaders/glsl-fs-loop-le.shader_test index 6c168b24..e9af169e 100644 --- a/tests/shaders/glsl-fs-loop-le.shader_test +++ b/tests/shaders/glsl-fs-loop-le.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader file] diff --git a/tests/shaders/glsl-fs-loop-lt.shader_test b/tests/shaders/glsl-fs-loop-lt.shader_test index 24c5567a..47e46f19 100644 --- a/tests/shaders/glsl-fs-loop-lt.shader_test +++ b/tests/shaders/glsl-fs-loop-lt.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader file] diff --git a/tests/shaders/glsl-fs-loop-nested-if.shader_test b/tests/shaders/glsl-fs-loop-nested-if.shader_test index 59c99c97..cc99d2f0 100644 --- a/tests/shaders/glsl-fs-loop-nested-if.shader_test +++ b/tests/shaders/glsl-fs-loop-nested-if.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-fs-loop-two-counter-01.shader_test b/tests/shaders/glsl-fs-loop-two-counter-01.shader_test index f27f4eca..793c07e0 100644 --- a/tests/shaders/glsl-fs-loop-two-counter-01.shader_test +++ b/tests/shaders/glsl-fs-loop-two-counter-01.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader file] diff --git a/tests/shaders/glsl-fs-loop-two-counter-02.shader_test b/tests/shaders/glsl-fs-loop-two-counter-02.shader_test index 61c3bb7c..888e1336 100644 --- a/tests/shaders/glsl-fs-loop-two-counter-02.shader_test +++ b/tests/shaders/glsl-fs-loop-two-counter-02.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader file] diff --git a/tests/shaders/glsl-fs-loop-two-counter-03.shader_test b/tests/shaders/glsl-fs-loop-two-counter-03.shader_test index b4cd18fb..5a255af7 100644 --- a/tests/shaders/glsl-fs-loop-two-counter-03.shader_test +++ b/tests/shaders/glsl-fs-loop-two-counter-03.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader file] diff --git a/tests/shaders/glsl-fs-loop-two-counter-04.shader_test b/tests/shaders/glsl-fs-loop-two-counter-04.shader_test index c015a1ad..d7e0e2d3 100644 --- a/tests/shaders/glsl-fs-loop-two-counter-04.shader_test +++ b/tests/shaders/glsl-fs-loop-two-counter-04.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader file] diff --git a/tests/shaders/glsl-fs-loop-zero-iter.shader_test b/tests/shaders/glsl-fs-loop-zero-iter.shader_test index 2919ead3..dfdcdbc4 100644 --- a/tests/shaders/glsl-fs-loop-zero-iter.shader_test +++ b/tests/shaders/glsl-fs-loop-zero-iter.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader file] diff --git a/tests/shaders/glsl-fs-main-return.shader_test b/tests/shaders/glsl-fs-main-return.shader_test index bfa064b7..944cc098 100644 --- a/tests/shaders/glsl-fs-main-return.shader_test +++ b/tests/shaders/glsl-fs-main-return.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-fs-max.shader_test b/tests/shaders/glsl-fs-max.shader_test index 4b7fed55..9865abd1 100644 --- a/tests/shaders/glsl-fs-max.shader_test +++ b/tests/shaders/glsl-fs-max.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-fs-min.shader_test b/tests/shaders/glsl-fs-min.shader_test index bb726424..0e229bf2 100644 --- a/tests/shaders/glsl-fs-min.shader_test +++ b/tests/shaders/glsl-fs-min.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-fs-mod.shader_test b/tests/shaders/glsl-fs-mod.shader_test index e5567348..8bf32775 100644 --- a/tests/shaders/glsl-fs-mod.shader_test +++ b/tests/shaders/glsl-fs-mod.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader file] diff --git a/tests/shaders/glsl-fs-mov-masked.shader_test b/tests/shaders/glsl-fs-mov-masked.shader_test index 2a927e1c..cc2c6bdf 100644 --- a/tests/shaders/glsl-fs-mov-masked.shader_test +++ b/tests/shaders/glsl-fs-mov-masked.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-fs-neg.shader_test b/tests/shaders/glsl-fs-neg.shader_test index f3afa676..770969e9 100644 --- a/tests/shaders/glsl-fs-neg.shader_test +++ b/tests/shaders/glsl-fs-neg.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader file] diff --git a/tests/shaders/glsl-fs-reflect.shader_test b/tests/shaders/glsl-fs-reflect.shader_test index 74bec04e..734e3bb8 100644 --- a/tests/shaders/glsl-fs-reflect.shader_test +++ b/tests/shaders/glsl-fs-reflect.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-fs-roundEven.shader_test b/tests/shaders/glsl-fs-roundEven.shader_test index 23dd8c83..4178c488 100644 --- a/tests/shaders/glsl-fs-roundEven.shader_test +++ b/tests/shaders/glsl-fs-roundEven.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.30 [vertex shader] diff --git a/tests/shaders/glsl-fs-sampler-numbering-2.shader_test b/tests/shaders/glsl-fs-sampler-numbering-2.shader_test index 6ae0f87a..b8ccdf68 100644 --- a/tests/shaders/glsl-fs-sampler-numbering-2.shader_test +++ b/tests/shaders/glsl-fs-sampler-numbering-2.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-fs-sampler-numbering-3.shader_test b/tests/shaders/glsl-fs-sampler-numbering-3.shader_test index 35090ab1..c9e18983 100644 --- a/tests/shaders/glsl-fs-sampler-numbering-3.shader_test +++ b/tests/shaders/glsl-fs-sampler-numbering-3.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-fs-shadow2d-bias.shader_test b/tests/shaders/glsl-fs-shadow2d-bias.shader_test index f3871c03..2632be17 100644 --- a/tests/shaders/glsl-fs-shadow2d-bias.shader_test +++ b/tests/shaders/glsl-fs-shadow2d-bias.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-fs-shadow2d.shader_test b/tests/shaders/glsl-fs-shadow2d.shader_test index 703f60b7..15d56021 100644 --- a/tests/shaders/glsl-fs-shadow2d.shader_test +++ b/tests/shaders/glsl-fs-shadow2d.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-fs-shadow2dproj-bias.shader_test b/tests/shaders/glsl-fs-shadow2dproj-bias.shader_test index 1488b05d..ff7b46bd 100644 --- a/tests/shaders/glsl-fs-shadow2dproj-bias.shader_test +++ b/tests/shaders/glsl-fs-shadow2dproj-bias.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-fs-shadow2dproj.shader_test b/tests/shaders/glsl-fs-shadow2dproj.shader_test index 0757b5f2..e855a9db 100644 --- a/tests/shaders/glsl-fs-shadow2dproj.shader_test +++ b/tests/shaders/glsl-fs-shadow2dproj.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-fs-sign.shader_test b/tests/shaders/glsl-fs-sign.shader_test index 5a53122d..a0709c02 100644 --- a/tests/shaders/glsl-fs-sign.shader_test +++ b/tests/shaders/glsl-fs-sign.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader file] diff --git a/tests/shaders/glsl-fs-statevar-call.shader_test b/tests/shaders/glsl-fs-statevar-call.shader_test index 14de16f1..9d08d052 100644 --- a/tests/shaders/glsl-fs-statevar-call.shader_test +++ b/tests/shaders/glsl-fs-statevar-call.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-fs-step.shader_test b/tests/shaders/glsl-fs-step.shader_test index d6730915..b7178351 100644 --- a/tests/shaders/glsl-fs-step.shader_test +++ b/tests/shaders/glsl-fs-step.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader file] diff --git a/tests/shaders/glsl-fs-struct-equal.shader_test b/tests/shaders/glsl-fs-struct-equal.shader_test index 03687776..e5502bfb 100644 --- a/tests/shaders/glsl-fs-struct-equal.shader_test +++ b/tests/shaders/glsl-fs-struct-equal.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader] diff --git a/tests/shaders/glsl-fs-struct-notequal.shader_test b/tests/shaders/glsl-fs-struct-notequal.shader_test index 0a296259..e373de22 100644 --- a/tests/shaders/glsl-fs-struct-notequal.shader_test +++ b/tests/shaders/glsl-fs-struct-notequal.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader] diff --git a/tests/shaders/glsl-fs-tan-1.shader_test b/tests/shaders/glsl-fs-tan-1.shader_test index ee86f8a5..1cf5c860 100644 --- a/tests/shaders/glsl-fs-tan-1.shader_test +++ b/tests/shaders/glsl-fs-tan-1.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-fs-tan-2.shader_test b/tests/shaders/glsl-fs-tan-2.shader_test index e32b10ca..672ba5d1 100644 --- a/tests/shaders/glsl-fs-tan-2.shader_test +++ b/tests/shaders/glsl-fs-tan-2.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-fs-tan-3.shader_test b/tests/shaders/glsl-fs-tan-3.shader_test index 7a75ea6d..ca010484 100644 --- a/tests/shaders/glsl-fs-tan-3.shader_test +++ b/tests/shaders/glsl-fs-tan-3.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-fs-texture2d-bias.shader_test b/tests/shaders/glsl-fs-texture2d-bias.shader_test index b635a21c..594a065d 100644 --- a/tests/shaders/glsl-fs-texture2d-bias.shader_test +++ b/tests/shaders/glsl-fs-texture2d-bias.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-fs-texture2d-masked-2.shader_test b/tests/shaders/glsl-fs-texture2d-masked-2.shader_test index 4ddfdcad..f6ff9aa3 100644 --- a/tests/shaders/glsl-fs-texture2d-masked-2.shader_test +++ b/tests/shaders/glsl-fs-texture2d-masked-2.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-fs-texture2d-masked.shader_test b/tests/shaders/glsl-fs-texture2d-masked.shader_test index 3f185a95..02ac384c 100644 --- a/tests/shaders/glsl-fs-texture2d-masked.shader_test +++ b/tests/shaders/glsl-fs-texture2d-masked.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-fs-texture2d.shader_test b/tests/shaders/glsl-fs-texture2d.shader_test index 232acab5..cd45f433 100644 --- a/tests/shaders/glsl-fs-texture2d.shader_test +++ b/tests/shaders/glsl-fs-texture2d.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-fs-texture2dproj-2.shader_test b/tests/shaders/glsl-fs-texture2dproj-2.shader_test index d7bf5c7c..3399f340 100644 --- a/tests/shaders/glsl-fs-texture2dproj-2.shader_test +++ b/tests/shaders/glsl-fs-texture2dproj-2.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-fs-texture2dproj-bias-2.shader_test b/tests/shaders/glsl-fs-texture2dproj-bias-2.shader_test index 37f43c87..3696a7ce 100644 --- a/tests/shaders/glsl-fs-texture2dproj-bias-2.shader_test +++ b/tests/shaders/glsl-fs-texture2dproj-bias-2.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-fs-texture2dproj-bias.shader_test b/tests/shaders/glsl-fs-texture2dproj-bias.shader_test index d0d7dea5..4320c3f3 100644 --- a/tests/shaders/glsl-fs-texture2dproj-bias.shader_test +++ b/tests/shaders/glsl-fs-texture2dproj-bias.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-fs-texture2dproj.shader_test b/tests/shaders/glsl-fs-texture2dproj.shader_test index 135ace63..6ca82dd0 100644 --- a/tests/shaders/glsl-fs-texture2dproj.shader_test +++ b/tests/shaders/glsl-fs-texture2dproj.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-fs-trunc.shader_test b/tests/shaders/glsl-fs-trunc.shader_test index 87fc482b..e6bbb916 100644 --- a/tests/shaders/glsl-fs-trunc.shader_test +++ b/tests/shaders/glsl-fs-trunc.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.30 [vertex shader] diff --git a/tests/shaders/glsl-fs-uniform-array-1.shader_test b/tests/shaders/glsl-fs-uniform-array-1.shader_test index 35fae473..b9925881 100644 --- a/tests/shaders/glsl-fs-uniform-array-1.shader_test +++ b/tests/shaders/glsl-fs-uniform-array-1.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-fs-uniform-array-2.shader_test b/tests/shaders/glsl-fs-uniform-array-2.shader_test index 2dbad7a7..582c1d10 100644 --- a/tests/shaders/glsl-fs-uniform-array-2.shader_test +++ b/tests/shaders/glsl-fs-uniform-array-2.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-fs-uniform-array-3.shader_test b/tests/shaders/glsl-fs-uniform-array-3.shader_test index ac82fe84..576b044a 100644 --- a/tests/shaders/glsl-fs-uniform-array-3.shader_test +++ b/tests/shaders/glsl-fs-uniform-array-3.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader] diff --git a/tests/shaders/glsl-fs-uniform-array-4.shader_test b/tests/shaders/glsl-fs-uniform-array-4.shader_test index 28b83977..c4aa1792 100644 --- a/tests/shaders/glsl-fs-uniform-array-4.shader_test +++ b/tests/shaders/glsl-fs-uniform-array-4.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader] diff --git a/tests/shaders/glsl-fs-uniform-array-5.shader_test b/tests/shaders/glsl-fs-uniform-array-5.shader_test index 725e022a..42b95f8d 100644 --- a/tests/shaders/glsl-fs-uniform-array-5.shader_test +++ b/tests/shaders/glsl-fs-uniform-array-5.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-fs-uniform-array-6.shader_test b/tests/shaders/glsl-fs-uniform-array-6.shader_test index 00f67ff6..1f507a34 100644 --- a/tests/shaders/glsl-fs-uniform-array-6.shader_test +++ b/tests/shaders/glsl-fs-uniform-array-6.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 GL_MAX_FRAGMENT_UNIFORM_COMPONENTS >= 4097 diff --git a/tests/shaders/glsl-fs-uniform-sampler-array.shader_test b/tests/shaders/glsl-fs-uniform-sampler-array.shader_test index 114a57d3..a4d5d47f 100644 --- a/tests/shaders/glsl-fs-uniform-sampler-array.shader_test +++ b/tests/shaders/glsl-fs-uniform-sampler-array.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-fs-uniform-sampler-struct.shader_test b/tests/shaders/glsl-fs-uniform-sampler-struct.shader_test index 7ab754da..6c7e0e50 100644 --- a/tests/shaders/glsl-fs-uniform-sampler-struct.shader_test +++ b/tests/shaders/glsl-fs-uniform-sampler-struct.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-fs-unroll-explosion.shader_test b/tests/shaders/glsl-fs-unroll-explosion.shader_test index 415bda61..dffd3840 100644 --- a/tests/shaders/glsl-fs-unroll-explosion.shader_test +++ b/tests/shaders/glsl-fs-unroll-explosion.shader_test @@ -1,6 +1,5 @@ // if you unroll all loops with a few iterations, you won't pass this [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-fs-varying-array.shader_test b/tests/shaders/glsl-fs-varying-array.shader_test index 3a4afa48..aa445588 100644 --- a/tests/shaders/glsl-fs-varying-array.shader_test +++ b/tests/shaders/glsl-fs-varying-array.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader] diff --git a/tests/shaders/glsl-fs-vec4-indexing-temp-dst-in-loop.shader_test b/tests/shaders/glsl-fs-vec4-indexing-temp-dst-in-loop.shader_test index 84fac670..859d1f0f 100644 --- a/tests/shaders/glsl-fs-vec4-indexing-temp-dst-in-loop.shader_test +++ b/tests/shaders/glsl-fs-vec4-indexing-temp-dst-in-loop.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-fs-vec4-indexing-temp-dst-in-nested-loop-combined.shader_test b/tests/shaders/glsl-fs-vec4-indexing-temp-dst-in-nested-loop-combined.shader_test index d434594a..e8d4bc8d 100644 --- a/tests/shaders/glsl-fs-vec4-indexing-temp-dst-in-nested-loop-combined.shader_test +++ b/tests/shaders/glsl-fs-vec4-indexing-temp-dst-in-nested-loop-combined.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-fs-vec4-indexing-temp-dst.shader_test b/tests/shaders/glsl-fs-vec4-indexing-temp-dst.shader_test index 4fb5c723..d543d0f8 100644 --- a/tests/shaders/glsl-fs-vec4-indexing-temp-dst.shader_test +++ b/tests/shaders/glsl-fs-vec4-indexing-temp-dst.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-fs-vec4-indexing-temp-src-in-loop.shader_test b/tests/shaders/glsl-fs-vec4-indexing-temp-src-in-loop.shader_test index 656db09f..4d388bac 100644 --- a/tests/shaders/glsl-fs-vec4-indexing-temp-src-in-loop.shader_test +++ b/tests/shaders/glsl-fs-vec4-indexing-temp-src-in-loop.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-fs-vec4-indexing-temp-src-in-nested-loop-combined.shader_test b/tests/shaders/glsl-fs-vec4-indexing-temp-src-in-nested-loop-combined.shader_test index 6848f396..e14b4fde 100644 --- a/tests/shaders/glsl-fs-vec4-indexing-temp-src-in-nested-loop-combined.shader_test +++ b/tests/shaders/glsl-fs-vec4-indexing-temp-src-in-nested-loop-combined.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-fs-vec4-indexing-temp-src-in-nested-loop-inner.shader_test b/tests/shaders/glsl-fs-vec4-indexing-temp-src-in-nested-loop-inner.shader_test index f9b10b72..4d3d70bf 100644 --- a/tests/shaders/glsl-fs-vec4-indexing-temp-src-in-nested-loop-inner.shader_test +++ b/tests/shaders/glsl-fs-vec4-indexing-temp-src-in-nested-loop-inner.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-fs-vec4-indexing-temp-src-in-nested-loop-outer.shader_test b/tests/shaders/glsl-fs-vec4-indexing-temp-src-in-nested-loop-outer.shader_test index b2ff1a35..eae7d13d 100644 --- a/tests/shaders/glsl-fs-vec4-indexing-temp-src-in-nested-loop-outer.shader_test +++ b/tests/shaders/glsl-fs-vec4-indexing-temp-src-in-nested-loop-outer.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-fs-vec4-indexing-temp-src.shader_test b/tests/shaders/glsl-fs-vec4-indexing-temp-src.shader_test index ce8016af..e5d5d2ba 100644 --- a/tests/shaders/glsl-fs-vec4-indexing-temp-src.shader_test +++ b/tests/shaders/glsl-fs-vec4-indexing-temp-src.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-fs-vec4-operator-equal.shader_test b/tests/shaders/glsl-fs-vec4-operator-equal.shader_test index f5af5316..5e84ad5f 100644 --- a/tests/shaders/glsl-fs-vec4-operator-equal.shader_test +++ b/tests/shaders/glsl-fs-vec4-operator-equal.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-fs-vec4-operator-notequal.shader_test b/tests/shaders/glsl-fs-vec4-operator-notequal.shader_test index 17377161..9c80f761 100644 --- a/tests/shaders/glsl-fs-vec4-operator-notequal.shader_test +++ b/tests/shaders/glsl-fs-vec4-operator-notequal.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-function-prototype.shader_test b/tests/shaders/glsl-function-prototype.shader_test index 3e149838..f96920d0 100644 --- a/tests/shaders/glsl-function-prototype.shader_test +++ b/tests/shaders/glsl-function-prototype.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-if-assign-call.shader_test b/tests/shaders/glsl-if-assign-call.shader_test index 3465609d..2569586a 100644 --- a/tests/shaders/glsl-if-assign-call.shader_test +++ b/tests/shaders/glsl-if-assign-call.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-implicit-conversion-01.shader_test b/tests/shaders/glsl-implicit-conversion-01.shader_test index f47d537c..f2d2e21c 100644 --- a/tests/shaders/glsl-implicit-conversion-01.shader_test +++ b/tests/shaders/glsl-implicit-conversion-01.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader file] diff --git a/tests/shaders/glsl-link-array-01.shader_test b/tests/shaders/glsl-link-array-01.shader_test index 69825f58..2d3465df 100644 --- a/tests/shaders/glsl-link-array-01.shader_test +++ b/tests/shaders/glsl-link-array-01.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-mat-110.shader_test b/tests/shaders/glsl-mat-110.shader_test index d36ac096..97ed8786 100644 --- a/tests/shaders/glsl-mat-110.shader_test +++ b/tests/shaders/glsl-mat-110.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-mat-from-int-ctor-01.shader_test b/tests/shaders/glsl-mat-from-int-ctor-01.shader_test index 92464ab1..727a719c 100644 --- a/tests/shaders/glsl-mat-from-int-ctor-01.shader_test +++ b/tests/shaders/glsl-mat-from-int-ctor-01.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader] diff --git a/tests/shaders/glsl-mat-from-int-ctor-02.shader_test b/tests/shaders/glsl-mat-from-int-ctor-02.shader_test index 3ff3323e..b14e4278 100644 --- a/tests/shaders/glsl-mat-from-int-ctor-02.shader_test +++ b/tests/shaders/glsl-mat-from-int-ctor-02.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-mat-from-int-ctor-03.shader_test b/tests/shaders/glsl-mat-from-int-ctor-03.shader_test index cb79d429..35045621 100644 --- a/tests/shaders/glsl-mat-from-int-ctor-03.shader_test +++ b/tests/shaders/glsl-mat-from-int-ctor-03.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader] diff --git a/tests/shaders/glsl-mat-from-vec-ctor-01.shader_test b/tests/shaders/glsl-mat-from-vec-ctor-01.shader_test index 08b5efad..303d0ba4 100644 --- a/tests/shaders/glsl-mat-from-vec-ctor-01.shader_test +++ b/tests/shaders/glsl-mat-from-vec-ctor-01.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-octal.shader_test b/tests/shaders/glsl-octal.shader_test index e9011c22..83482aaf 100644 --- a/tests/shaders/glsl-octal.shader_test +++ b/tests/shaders/glsl-octal.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-override-builtin.shader_test b/tests/shaders/glsl-override-builtin.shader_test index b56fa9d4..e831a004 100644 --- a/tests/shaders/glsl-override-builtin.shader_test +++ b/tests/shaders/glsl-override-builtin.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader file] diff --git a/tests/shaders/glsl-pp-elif-no-expression-1.shader_test b/tests/shaders/glsl-pp-elif-no-expression-1.shader_test index 45bfc323..7b97ee7d 100644 --- a/tests/shaders/glsl-pp-elif-no-expression-1.shader_test +++ b/tests/shaders/glsl-pp-elif-no-expression-1.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader file] diff --git a/tests/shaders/glsl-precision-110.shader_test b/tests/shaders/glsl-precision-110.shader_test index 547e82a4..1c9f301c 100644 --- a/tests/shaders/glsl-precision-110.shader_test +++ b/tests/shaders/glsl-precision-110.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-texcoord-array-2.shader_test b/tests/shaders/glsl-texcoord-array-2.shader_test index 52e1674f..00f0ecf1 100644 --- a/tests/shaders/glsl-texcoord-array-2.shader_test +++ b/tests/shaders/glsl-texcoord-array-2.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-texcoord-array.shader_test b/tests/shaders/glsl-texcoord-array.shader_test index dae78904..1d55f24c 100644 --- a/tests/shaders/glsl-texcoord-array.shader_test +++ b/tests/shaders/glsl-texcoord-array.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-uniform-initializer-1.shader_test b/tests/shaders/glsl-uniform-initializer-1.shader_test index 4bc6c065..49b4c686 100644 --- a/tests/shaders/glsl-uniform-initializer-1.shader_test +++ b/tests/shaders/glsl-uniform-initializer-1.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader] diff --git a/tests/shaders/glsl-uniform-initializer-2.shader_test b/tests/shaders/glsl-uniform-initializer-2.shader_test index c94cd713..c9aa7957 100644 --- a/tests/shaders/glsl-uniform-initializer-2.shader_test +++ b/tests/shaders/glsl-uniform-initializer-2.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader] diff --git a/tests/shaders/glsl-uniform-initializer-3.shader_test b/tests/shaders/glsl-uniform-initializer-3.shader_test index c63bb938..d7227a2f 100644 --- a/tests/shaders/glsl-uniform-initializer-3.shader_test +++ b/tests/shaders/glsl-uniform-initializer-3.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader] diff --git a/tests/shaders/glsl-uniform-initializer-4.shader_test b/tests/shaders/glsl-uniform-initializer-4.shader_test index 04527359..f4a8eb64 100644 --- a/tests/shaders/glsl-uniform-initializer-4.shader_test +++ b/tests/shaders/glsl-uniform-initializer-4.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader] diff --git a/tests/shaders/glsl-uniform-initializer-5.shader_test b/tests/shaders/glsl-uniform-initializer-5.shader_test index 41f9ce47..de62b267 100644 --- a/tests/shaders/glsl-uniform-initializer-5.shader_test +++ b/tests/shaders/glsl-uniform-initializer-5.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader] diff --git a/tests/shaders/glsl-uniform-initializer-6.shader_test b/tests/shaders/glsl-uniform-initializer-6.shader_test index b80b7fdb..db598b27 100644 --- a/tests/shaders/glsl-uniform-initializer-6.shader_test +++ b/tests/shaders/glsl-uniform-initializer-6.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader] diff --git a/tests/shaders/glsl-uniform-initializer-7.shader_test b/tests/shaders/glsl-uniform-initializer-7.shader_test index 430d3390..4d6f28f6 100644 --- a/tests/shaders/glsl-uniform-initializer-7.shader_test +++ b/tests/shaders/glsl-uniform-initializer-7.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader] diff --git a/tests/shaders/glsl-uniform-linking-1.shader_test b/tests/shaders/glsl-uniform-linking-1.shader_test index 74b9c7bd..bfbee48d 100644 --- a/tests/shaders/glsl-uniform-linking-1.shader_test +++ b/tests/shaders/glsl-uniform-linking-1.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-uniform-struct.shader_test b/tests/shaders/glsl-uniform-struct.shader_test index 82581091..e7343e49 100644 --- a/tests/shaders/glsl-uniform-struct.shader_test +++ b/tests/shaders/glsl-uniform-struct.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader] diff --git a/tests/shaders/glsl-varying-mat3x2.shader_test b/tests/shaders/glsl-varying-mat3x2.shader_test index 6a0167ca..6aaeb5c8 100644 --- a/tests/shaders/glsl-varying-mat3x2.shader_test +++ b/tests/shaders/glsl-varying-mat3x2.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 /* Test varying matrix whose column number greater than the row number. diff --git a/tests/shaders/glsl-version-define-110.shader_test b/tests/shaders/glsl-version-define-110.shader_test index 75917016..c5847405 100644 --- a/tests/shaders/glsl-version-define-110.shader_test +++ b/tests/shaders/glsl-version-define-110.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-version-define-120.shader_test b/tests/shaders/glsl-version-define-120.shader_test index 2b88966d..65537f5b 100644 --- a/tests/shaders/glsl-version-define-120.shader_test +++ b/tests/shaders/glsl-version-define-120.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader] diff --git a/tests/shaders/glsl-version-define.shader_test b/tests/shaders/glsl-version-define.shader_test index de775efc..847f3e4a 100644 --- a/tests/shaders/glsl-version-define.shader_test +++ b/tests/shaders/glsl-version-define.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-vs-all-01.shader_test b/tests/shaders/glsl-vs-all-01.shader_test index 3b9e8af8..e628f3ca 100644 --- a/tests/shaders/glsl-vs-all-01.shader_test +++ b/tests/shaders/glsl-vs-all-01.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-vs-all-02.shader_test b/tests/shaders/glsl-vs-all-02.shader_test index 28c4f6a9..7cb7e7c9 100644 --- a/tests/shaders/glsl-vs-all-02.shader_test +++ b/tests/shaders/glsl-vs-all-02.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-vs-arrays-2.shader_test b/tests/shaders/glsl-vs-arrays-2.shader_test index d4aaf5e0..bdb476f9 100644 --- a/tests/shaders/glsl-vs-arrays-2.shader_test +++ b/tests/shaders/glsl-vs-arrays-2.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-vs-arrays-3.shader_test b/tests/shaders/glsl-vs-arrays-3.shader_test index 36d5be86..c67b3abd 100644 --- a/tests/shaders/glsl-vs-arrays-3.shader_test +++ b/tests/shaders/glsl-vs-arrays-3.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader] diff --git a/tests/shaders/glsl-vs-clamp-1.shader_test b/tests/shaders/glsl-vs-clamp-1.shader_test index 8590d977..1511ad19 100644 --- a/tests/shaders/glsl-vs-clamp-1.shader_test +++ b/tests/shaders/glsl-vs-clamp-1.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-vs-constructor-call.shader_test b/tests/shaders/glsl-vs-constructor-call.shader_test index be0803a5..95878f1c 100644 --- a/tests/shaders/glsl-vs-constructor-call.shader_test +++ b/tests/shaders/glsl-vs-constructor-call.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-vs-cross-2.shader_test b/tests/shaders/glsl-vs-cross-2.shader_test index 9fafaff0..ed106668 100644 --- a/tests/shaders/glsl-vs-cross-2.shader_test +++ b/tests/shaders/glsl-vs-cross-2.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-vs-cross-3.shader_test b/tests/shaders/glsl-vs-cross-3.shader_test index f1c845bb..6d7706a3 100644 --- a/tests/shaders/glsl-vs-cross-3.shader_test +++ b/tests/shaders/glsl-vs-cross-3.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-vs-cross.shader_test b/tests/shaders/glsl-vs-cross.shader_test index 5204a209..06e664f4 100644 --- a/tests/shaders/glsl-vs-cross.shader_test +++ b/tests/shaders/glsl-vs-cross.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-vs-dot-vec2.shader_test b/tests/shaders/glsl-vs-dot-vec2.shader_test index 74e5883c..3d7ca3a8 100644 --- a/tests/shaders/glsl-vs-dot-vec2.shader_test +++ b/tests/shaders/glsl-vs-dot-vec2.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-vs-ff-frag.shader_test b/tests/shaders/glsl-vs-ff-frag.shader_test index 95b00570..e87f2b3c 100644 --- a/tests/shaders/glsl-vs-ff-frag.shader_test +++ b/tests/shaders/glsl-vs-ff-frag.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-vs-functions-2.shader_test b/tests/shaders/glsl-vs-functions-2.shader_test index baf86e93..0d5aa1f5 100644 --- a/tests/shaders/glsl-vs-functions-2.shader_test +++ b/tests/shaders/glsl-vs-functions-2.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-vs-functions-3.shader_test b/tests/shaders/glsl-vs-functions-3.shader_test index f76e8bf2..d868c08b 100644 --- a/tests/shaders/glsl-vs-functions-3.shader_test +++ b/tests/shaders/glsl-vs-functions-3.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-vs-if-greater-equal.shader_test b/tests/shaders/glsl-vs-if-greater-equal.shader_test index cf5b3d3c..2954ec7d 100644 --- a/tests/shaders/glsl-vs-if-greater-equal.shader_test +++ b/tests/shaders/glsl-vs-if-greater-equal.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-vs-if-greater.shader_test b/tests/shaders/glsl-vs-if-greater.shader_test index ffe73ce6..03e1047c 100644 --- a/tests/shaders/glsl-vs-if-greater.shader_test +++ b/tests/shaders/glsl-vs-if-greater.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-vs-if-less-equal.shader_test b/tests/shaders/glsl-vs-if-less-equal.shader_test index c480ffde..b0497f4e 100644 --- a/tests/shaders/glsl-vs-if-less-equal.shader_test +++ b/tests/shaders/glsl-vs-if-less-equal.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-vs-if-less.shader_test b/tests/shaders/glsl-vs-if-less.shader_test index 99aa623c..2cb5e3ba 100644 --- a/tests/shaders/glsl-vs-if-less.shader_test +++ b/tests/shaders/glsl-vs-if-less.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-vs-if-nested-loop.shader_test b/tests/shaders/glsl-vs-if-nested-loop.shader_test index 54d9931e..9e8dba90 100644 --- a/tests/shaders/glsl-vs-if-nested-loop.shader_test +++ b/tests/shaders/glsl-vs-if-nested-loop.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-vs-if-nested.shader_test b/tests/shaders/glsl-vs-if-nested.shader_test index d3ff5e65..4bd90831 100644 --- a/tests/shaders/glsl-vs-if-nested.shader_test +++ b/tests/shaders/glsl-vs-if-nested.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-vs-inline-explosion.shader_test b/tests/shaders/glsl-vs-inline-explosion.shader_test index 27593ae9..791f8ede 100644 --- a/tests/shaders/glsl-vs-inline-explosion.shader_test +++ b/tests/shaders/glsl-vs-inline-explosion.shader_test @@ -1,6 +1,5 @@ // if you inline all functions indiscriminately, you won't pass this [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-vs-large-uniform-array.shader_test b/tests/shaders/glsl-vs-large-uniform-array.shader_test index 1d947c1d..a11c2608 100644 --- a/tests/shaders/glsl-vs-large-uniform-array.shader_test +++ b/tests/shaders/glsl-vs-large-uniform-array.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-vs-main-return.shader_test b/tests/shaders/glsl-vs-main-return.shader_test index d939e7cc..6b90f6d3 100644 --- a/tests/shaders/glsl-vs-main-return.shader_test +++ b/tests/shaders/glsl-vs-main-return.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-vs-masked-cos.shader_test b/tests/shaders/glsl-vs-masked-cos.shader_test index cc42f6ea..92ab5e6c 100644 --- a/tests/shaders/glsl-vs-masked-cos.shader_test +++ b/tests/shaders/glsl-vs-masked-cos.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-vs-masked-dot.shader_test b/tests/shaders/glsl-vs-masked-dot.shader_test index b53ba375..5b19761c 100644 --- a/tests/shaders/glsl-vs-masked-dot.shader_test +++ b/tests/shaders/glsl-vs-masked-dot.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-vs-mat-add-1.shader_test b/tests/shaders/glsl-vs-mat-add-1.shader_test index f2d73430..1de11211 100644 --- a/tests/shaders/glsl-vs-mat-add-1.shader_test +++ b/tests/shaders/glsl-vs-mat-add-1.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-vs-mat-div-1.shader_test b/tests/shaders/glsl-vs-mat-div-1.shader_test index 281e3486..6c361c29 100644 --- a/tests/shaders/glsl-vs-mat-div-1.shader_test +++ b/tests/shaders/glsl-vs-mat-div-1.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-vs-mat-div-2.shader_test b/tests/shaders/glsl-vs-mat-div-2.shader_test index 254b8b57..2ed598e1 100644 --- a/tests/shaders/glsl-vs-mat-div-2.shader_test +++ b/tests/shaders/glsl-vs-mat-div-2.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-vs-mat-mul-1.shader_test b/tests/shaders/glsl-vs-mat-mul-1.shader_test index 6b8a1807..a21cee6b 100644 --- a/tests/shaders/glsl-vs-mat-mul-1.shader_test +++ b/tests/shaders/glsl-vs-mat-mul-1.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-vs-mat-mul-2.shader_test b/tests/shaders/glsl-vs-mat-mul-2.shader_test index 42330f3e..436c8d23 100644 --- a/tests/shaders/glsl-vs-mat-mul-2.shader_test +++ b/tests/shaders/glsl-vs-mat-mul-2.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-vs-mat-mul-3.shader_test b/tests/shaders/glsl-vs-mat-mul-3.shader_test index a4f890ea..24b2f36b 100644 --- a/tests/shaders/glsl-vs-mat-mul-3.shader_test +++ b/tests/shaders/glsl-vs-mat-mul-3.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-vs-mat-sub-1.shader_test b/tests/shaders/glsl-vs-mat-sub-1.shader_test index f034f3ad..0c092bc4 100644 --- a/tests/shaders/glsl-vs-mat-sub-1.shader_test +++ b/tests/shaders/glsl-vs-mat-sub-1.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-vs-position-outval.shader_test b/tests/shaders/glsl-vs-position-outval.shader_test index 5eae3714..b2e507a5 100644 --- a/tests/shaders/glsl-vs-position-outval.shader_test +++ b/tests/shaders/glsl-vs-position-outval.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-vs-sign.shader_test b/tests/shaders/glsl-vs-sign.shader_test index 8d92611c..1e328a45 100644 --- a/tests/shaders/glsl-vs-sign.shader_test +++ b/tests/shaders/glsl-vs-sign.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-vs-swizzle-swizzle-lhs.shader_test b/tests/shaders/glsl-vs-swizzle-swizzle-lhs.shader_test index e48758d0..093942c3 100644 --- a/tests/shaders/glsl-vs-swizzle-swizzle-lhs.shader_test +++ b/tests/shaders/glsl-vs-swizzle-swizzle-lhs.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-vs-swizzle-swizzle-rhs.shader_test b/tests/shaders/glsl-vs-swizzle-swizzle-rhs.shader_test index 33ba58d0..1858d25f 100644 --- a/tests/shaders/glsl-vs-swizzle-swizzle-rhs.shader_test +++ b/tests/shaders/glsl-vs-swizzle-swizzle-rhs.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-vs-uniform-array-1.shader_test b/tests/shaders/glsl-vs-uniform-array-1.shader_test index 97bb096d..67193952 100644 --- a/tests/shaders/glsl-vs-uniform-array-1.shader_test +++ b/tests/shaders/glsl-vs-uniform-array-1.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-vs-uniform-array-2.shader_test b/tests/shaders/glsl-vs-uniform-array-2.shader_test index 5f8235b6..8a4ad1be 100644 --- a/tests/shaders/glsl-vs-uniform-array-2.shader_test +++ b/tests/shaders/glsl-vs-uniform-array-2.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-vs-unroll-explosion.shader_test b/tests/shaders/glsl-vs-unroll-explosion.shader_test index ef07dfa1..da8a879f 100644 --- a/tests/shaders/glsl-vs-unroll-explosion.shader_test +++ b/tests/shaders/glsl-vs-unroll-explosion.shader_test @@ -1,6 +1,5 @@ // if you inline all functions indiscriminately, you won't pass this [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-vs-varying-array.shader_test b/tests/shaders/glsl-vs-varying-array.shader_test index 95345e24..26c55d36 100644 --- a/tests/shaders/glsl-vs-varying-array.shader_test +++ b/tests/shaders/glsl-vs-varying-array.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.20 [vertex shader] diff --git a/tests/shaders/glsl-vs-vec4-indexing-1.shader_test b/tests/shaders/glsl-vs-vec4-indexing-1.shader_test index d9878b6b..5824f047 100644 --- a/tests/shaders/glsl-vs-vec4-indexing-1.shader_test +++ b/tests/shaders/glsl-vs-vec4-indexing-1.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-vs-vec4-indexing-2.shader_test b/tests/shaders/glsl-vs-vec4-indexing-2.shader_test index 6b3cbb4a..154c0c66 100644 --- a/tests/shaders/glsl-vs-vec4-indexing-2.shader_test +++ b/tests/shaders/glsl-vs-vec4-indexing-2.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-vs-vec4-indexing-3.shader_test b/tests/shaders/glsl-vs-vec4-indexing-3.shader_test index 31037efc..85cb7775 100644 --- a/tests/shaders/glsl-vs-vec4-indexing-3.shader_test +++ b/tests/shaders/glsl-vs-vec4-indexing-3.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-vs-vec4-indexing-4.shader_test b/tests/shaders/glsl-vs-vec4-indexing-4.shader_test index e6d6fff0..a5b12505 100644 --- a/tests/shaders/glsl-vs-vec4-indexing-4.shader_test +++ b/tests/shaders/glsl-vs-vec4-indexing-4.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-vs-vec4-indexing-5.shader_test b/tests/shaders/glsl-vs-vec4-indexing-5.shader_test index 58f82091..9a22a0d6 100644 --- a/tests/shaders/glsl-vs-vec4-indexing-5.shader_test +++ b/tests/shaders/glsl-vs-vec4-indexing-5.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-vs-vec4-indexing-6.shader_test b/tests/shaders/glsl-vs-vec4-indexing-6.shader_test index 08c59956..17b4347c 100644 --- a/tests/shaders/glsl-vs-vec4-indexing-6.shader_test +++ b/tests/shaders/glsl-vs-vec4-indexing-6.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-vs-vec4-indexing-temp-dst-in-loop.shader_test b/tests/shaders/glsl-vs-vec4-indexing-temp-dst-in-loop.shader_test index d38dc65b..77d6e6ad 100644 --- a/tests/shaders/glsl-vs-vec4-indexing-temp-dst-in-loop.shader_test +++ b/tests/shaders/glsl-vs-vec4-indexing-temp-dst-in-loop.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-vs-vec4-indexing-temp-dst-in-nested-loop-combined.shader_test b/tests/shaders/glsl-vs-vec4-indexing-temp-dst-in-nested-loop-combined.shader_test index 07bff657..54f8b681 100644 --- a/tests/shaders/glsl-vs-vec4-indexing-temp-dst-in-nested-loop-combined.shader_test +++ b/tests/shaders/glsl-vs-vec4-indexing-temp-dst-in-nested-loop-combined.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-vs-vec4-indexing-temp-dst.shader_test b/tests/shaders/glsl-vs-vec4-indexing-temp-dst.shader_test index 8d9ce5be..f5c93e09 100644 --- a/tests/shaders/glsl-vs-vec4-indexing-temp-dst.shader_test +++ b/tests/shaders/glsl-vs-vec4-indexing-temp-dst.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-vs-vec4-indexing-temp-src-in-loop.shader_test b/tests/shaders/glsl-vs-vec4-indexing-temp-src-in-loop.shader_test index 0db89486..b8bc3c96 100644 --- a/tests/shaders/glsl-vs-vec4-indexing-temp-src-in-loop.shader_test +++ b/tests/shaders/glsl-vs-vec4-indexing-temp-src-in-loop.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-vs-vec4-indexing-temp-src-in-nested-loop-combined.shader_test b/tests/shaders/glsl-vs-vec4-indexing-temp-src-in-nested-loop-combined.shader_test index 0114bd75..bd29f9eb 100644 --- a/tests/shaders/glsl-vs-vec4-indexing-temp-src-in-nested-loop-combined.shader_test +++ b/tests/shaders/glsl-vs-vec4-indexing-temp-src-in-nested-loop-combined.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-vs-vec4-indexing-temp-src-in-nested-loop-inner.shader_test b/tests/shaders/glsl-vs-vec4-indexing-temp-src-in-nested-loop-inner.shader_test index 85305b77..a2e28b08 100644 --- a/tests/shaders/glsl-vs-vec4-indexing-temp-src-in-nested-loop-inner.shader_test +++ b/tests/shaders/glsl-vs-vec4-indexing-temp-src-in-nested-loop-inner.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-vs-vec4-indexing-temp-src-in-nested-loop-outer.shader_test b/tests/shaders/glsl-vs-vec4-indexing-temp-src-in-nested-loop-outer.shader_test index 0c4574db..8ae9e90c 100644 --- a/tests/shaders/glsl-vs-vec4-indexing-temp-src-in-nested-loop-outer.shader_test +++ b/tests/shaders/glsl-vs-vec4-indexing-temp-src-in-nested-loop-outer.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-vs-vec4-indexing-temp-src.shader_test b/tests/shaders/glsl-vs-vec4-indexing-temp-src.shader_test index 2acbeb37..26e375e4 100644 --- a/tests/shaders/glsl-vs-vec4-indexing-temp-src.shader_test +++ b/tests/shaders/glsl-vs-vec4-indexing-temp-src.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-vs-vec4-operator-equal.shader_test b/tests/shaders/glsl-vs-vec4-operator-equal.shader_test index 0e99c8b8..cba3283c 100644 --- a/tests/shaders/glsl-vs-vec4-operator-equal.shader_test +++ b/tests/shaders/glsl-vs-vec4-operator-equal.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/glsl-vs-vec4-operator-notequal.shader_test b/tests/shaders/glsl-vs-vec4-operator-notequal.shader_test index e6e59572..7f03b8fc 100644 --- a/tests/shaders/glsl-vs-vec4-operator-notequal.shader_test +++ b/tests/shaders/glsl-vs-vec4-operator-notequal.shader_test @@ -1,5 +1,4 @@ [require] -GL >= 2.0 GLSL >= 1.10 [vertex shader] diff --git a/tests/shaders/shader_runner.c b/tests/shaders/shader_runner.c index 51ace3e8..9a7ce3ee 100644 --- a/tests/shaders/shader_runner.c +++ b/tests/shaders/shader_runner.c @@ -95,25 +95,39 @@ enum comparison { void compile_glsl(GLenum target, bool release_text) { - GLuint shader = glCreateShader(target); + GLuint shader = piglit_CreateShader(target); GLint ok; unsigned i; - glShaderSource(shader, num_shader_strings, - (const GLchar **) shader_strings, shader_string_sizes); + switch (target) { + case GL_VERTEX_SHADER: + piglit_require_vertex_shader(); + break; + case GL_FRAGMENT_SHADER: + piglit_require_fragment_shader(); + break; + case GL_GEOMETRY_SHADER_ARB: + if (gl_version < 3.2) + piglit_require_extension("GL_ARB_geometry_shader4"); + break; + } - glCompileShader(shader); + piglit_ShaderSource(shader, num_shader_strings, + (const GLchar **) shader_strings, + shader_string_sizes); - glGetShaderiv(shader, GL_COMPILE_STATUS, &ok); + piglit_CompileShader(shader); + + piglit_GetShaderiv(shader, GL_COMPILE_STATUS, &ok); if (!ok) { GLchar *info; GLint size; - glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &size); + piglit_GetShaderiv(shader, GL_INFO_LOG_LENGTH, &size); info = malloc(size); - glGetShaderInfoLog(shader, size, NULL, info); + piglit_GetShaderInfoLog(shader, size, NULL, info); fprintf(stderr, "Failed to compile %s: %s\n", target == GL_FRAGMENT_SHADER ? "FS" : "VS", @@ -466,43 +480,43 @@ link_and_use_shaders(void) && (num_geometry_shaders == 0)) return; - prog = glCreateProgram(); + prog = piglit_CreateProgram(); for (i = 0; i < num_vertex_shaders; i++) { - glAttachShader(prog, vertex_shaders[i]); + piglit_AttachShader(prog, vertex_shaders[i]); } for (i = 0; i < num_geometry_shaders; i++) { - glAttachShader(prog, geometry_shaders[i]); + piglit_AttachShader(prog, geometry_shaders[i]); } for (i = 0; i < num_fragment_shaders; i++) { - glAttachShader(prog, fragment_shaders[i]); + piglit_AttachShader(prog, fragment_shaders[i]); } - glLinkProgram(prog); + piglit_LinkProgram(prog); for (i = 0; i < num_vertex_shaders; i++) { - glDeleteShader(vertex_shaders[i]); + piglit_DeleteShader(vertex_shaders[i]); } for (i = 0; i < num_geometry_shaders; i++) { - glDeleteShader(geometry_shaders[i]); + piglit_DeleteShader(geometry_shaders[i]); } for (i = 0; i < num_fragment_shaders; i++) { - glDeleteShader(fragment_shaders[i]); + piglit_DeleteShader(fragment_shaders[i]); } - glGetProgramiv(prog, GL_LINK_STATUS, &ok); + piglit_GetProgramiv(prog, GL_LINK_STATUS, &ok); if (!ok) { GLchar *info; GLint size; - glGetProgramiv(prog, GL_INFO_LOG_LENGTH, &size); + piglit_GetProgramiv(prog, GL_INFO_LOG_LENGTH, &size); info = malloc(size); - glGetProgramInfoLog(prog, size, NULL, info); + piglit_GetProgramInfoLog(prog, size, NULL, info); fprintf(stderr, "Failed to link:\n%s\n", info); @@ -511,7 +525,7 @@ link_and_use_shaders(void) piglit_report_result(PIGLIT_FAILURE); } - glUseProgram(prog); + piglit_UseProgram(prog); err = glGetError(); if (err) { @@ -520,10 +534,10 @@ link_and_use_shaders(void) printf("GL error after linking program: 0x%04x\n", err); - glGetProgramiv(prog, GL_INFO_LOG_LENGTH, &size); + piglit_GetProgramiv(prog, GL_INFO_LOG_LENGTH, &size); info = malloc(size); - glGetProgramInfoLog(prog, size, NULL, info); + piglit_GetProgramInfoLog(prog, size, NULL, info); fprintf(stderr, "Info log: %s\n", info); piglit_report_result(PIGLIT_FAILURE); @@ -636,7 +650,7 @@ set_uniform(const char *line) line = eat_text(type); line = strcpy_to_space(name, eat_whitespace(line)); - loc = glGetUniformLocation(prog, name); + loc = piglit_GetUniformLocation(prog, name); if (loc < 0) { printf("cannot get location of uniform \"%s\"\n", name); @@ -645,25 +659,25 @@ set_uniform(const char *line) if (strncmp("float", type, 5) == 0) { get_floats(line, f, 1); - glUniform1fv(loc, 1, f); + piglit_Uniform1fv(loc, 1, f); return; } else if (strncmp("int", type, 3) == 0) { int val = atoi(line); - glUniform1i(loc, val); + piglit_Uniform1i(loc, val); return; } else if (strncmp("vec", type, 3) == 0) { switch (type[3]) { case '2': get_floats(line, f, 2); - glUniform2fv(loc, 1, f); + piglit_Uniform2fv(loc, 1, f); return; case '3': get_floats(line, f, 3); - glUniform3fv(loc, 1, f); + piglit_Uniform3fv(loc, 1, f); return; case '4': get_floats(line, f, 4); - glUniform4fv(loc, 1, f); + piglit_Uniform4fv(loc, 1, f); return; } } @@ -816,8 +830,8 @@ piglit_display(void) if (piglit_automatic) { /* Free our resources, useful for valgrinding. */ - glDeleteProgram(prog); - glUseProgram(0); + piglit_DeleteProgram(prog); + piglit_UseProgram(0); } return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE; @@ -829,6 +843,8 @@ piglit_init(int argc, char **argv) { const char *glsl_version_string; + piglit_require_GLSL(); + gl_version = strtod((char *) glGetString(GL_VERSION), NULL); glsl_version_string = (char *) |