summaryrefslogtreecommitdiff
path: root/tests/general
diff options
context:
space:
mode:
Diffstat (limited to 'tests/general')
-rw-r--r--tests/general/bgra-sec-color-pointer.c5
-rw-r--r--tests/general/bgra-vert-attrib-pointer.c5
-rw-r--r--tests/general/blendminmax.c5
-rw-r--r--tests/general/clear-varray-2.0.c5
-rw-r--r--tests/general/draw-batch.c5
-rw-r--r--tests/general/draw-elements-base-vertex-neg.c5
-rw-r--r--tests/general/draw-elements-vs-inputs.c5
-rw-r--r--tests/general/draw-elements.c5
-rw-r--r--tests/general/draw-vertices-half-float.c5
-rw-r--r--tests/general/draw-vertices.c5
-rw-r--r--tests/general/early-z.c5
-rw-r--r--tests/general/isbufferobj.c5
-rw-r--r--tests/general/occlusion-query-discard.c5
-rw-r--r--tests/general/texunits.c5
-rw-r--r--tests/general/vao-element-array-buffer.c5
15 files changed, 15 insertions, 60 deletions
diff --git a/tests/general/bgra-sec-color-pointer.c b/tests/general/bgra-sec-color-pointer.c
index 6e5fc1946..7b3821cfe 100644
--- a/tests/general/bgra-sec-color-pointer.c
+++ b/tests/general/bgra-sec-color-pointer.c
@@ -52,10 +52,7 @@ static GLubyte colors[16] = {255, 0, 0, 127,
void
piglit_init(int argc, char **argv)
{
- if (piglit_get_gl_version() < 14) {
- printf("Requires OpenGL 1.4\n");
- piglit_report_result(PIGLIT_SKIP);
- }
+ piglit_require_gl_version(14);
piglit_require_extension("GL_EXT_vertex_array_bgra");
diff --git a/tests/general/bgra-vert-attrib-pointer.c b/tests/general/bgra-vert-attrib-pointer.c
index f3703c3f2..54048763d 100644
--- a/tests/general/bgra-vert-attrib-pointer.c
+++ b/tests/general/bgra-vert-attrib-pointer.c
@@ -110,10 +110,7 @@ compileLinkProg(void)
void
piglit_init(int argc, char **argv)
{
- if (piglit_get_gl_version() < 20) {
- printf("Requires OpenGL 2.0\n");
- piglit_report_result(PIGLIT_SKIP);
- }
+ piglit_require_gl_version(20);
piglit_require_extension("GL_EXT_vertex_array_bgra");
diff --git a/tests/general/blendminmax.c b/tests/general/blendminmax.c
index c4fc442fb..9f698805c 100644
--- a/tests/general/blendminmax.c
+++ b/tests/general/blendminmax.c
@@ -132,10 +132,7 @@ piglit_init(int argc, char **argv)
piglit_report_result(PIGLIT_SKIP);
}
- if (piglit_get_gl_version() < 14) {
- printf("Requires OpenGL 1.4\n");
- piglit_report_result(PIGLIT_SKIP);
- }
+ piglit_require_gl_version(14);
printf("\nAll 4 quads should be the same color.\n");
glEnable(GL_BLEND);
diff --git a/tests/general/clear-varray-2.0.c b/tests/general/clear-varray-2.0.c
index 697cd3f0a..e13b29cec 100644
--- a/tests/general/clear-varray-2.0.c
+++ b/tests/general/clear-varray-2.0.c
@@ -129,10 +129,7 @@ piglit_init(int argc, char **argv)
{
GLuint vert_prog, frag_prog;
- if (piglit_get_gl_version() < 20) {
- printf("Requires OpenGL 2.0\n");
- piglit_report_result(PIGLIT_SKIP);
- }
+ piglit_require_gl_version(20);
reshape(piglit_width, piglit_height);
diff --git a/tests/general/draw-batch.c b/tests/general/draw-batch.c
index c21b8b7b9..6c9b105a0 100644
--- a/tests/general/draw-batch.c
+++ b/tests/general/draw-batch.c
@@ -32,10 +32,7 @@ PIGLIT_GL_TEST_MAIN(
void
piglit_init(int argc, char **argv)
{
- if (piglit_get_gl_version() < 14) {
- printf("Requires OpenGL 1.4.\n");
- piglit_report_result(PIGLIT_SKIP);
- }
+ piglit_require_gl_version(14);
}
static void rotate_colors(float *array)
diff --git a/tests/general/draw-elements-base-vertex-neg.c b/tests/general/draw-elements-base-vertex-neg.c
index 6e7b260ba..ebb72fc43 100644
--- a/tests/general/draw-elements-base-vertex-neg.c
+++ b/tests/general/draw-elements-base-vertex-neg.c
@@ -46,10 +46,7 @@ void piglit_init(int argc, char **argv)
piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
- if (piglit_get_gl_version() < 15) {
- printf("Requires OpenGL 1.5\n");
- piglit_report_result(PIGLIT_SKIP);
- }
+ piglit_require_gl_version(15);
piglit_require_extension("GL_ARB_draw_elements_base_vertex");
diff --git a/tests/general/draw-elements-vs-inputs.c b/tests/general/draw-elements-vs-inputs.c
index ff1162694..4c73fff41 100644
--- a/tests/general/draw-elements-vs-inputs.c
+++ b/tests/general/draw-elements-vs-inputs.c
@@ -49,10 +49,7 @@ piglit_init(int argc, char **argv)
{
GLfloat red[4] = {1, 0, 0, 1};
- if (piglit_get_gl_version() < 12) {
- printf("Requires OpenGL 1.2\n");
- piglit_report_result(PIGLIT_SKIP);
- }
+ piglit_require_gl_version(12);
glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, red);
diff --git a/tests/general/draw-elements.c b/tests/general/draw-elements.c
index b2bfbd5c0..32cdf9211 100644
--- a/tests/general/draw-elements.c
+++ b/tests/general/draw-elements.c
@@ -51,10 +51,7 @@ void piglit_init(int argc, char **argv)
piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
- if (piglit_get_gl_version() < 15) {
- printf("Requires OpenGL 1.5\n");
- piglit_report_result(PIGLIT_SKIP);
- }
+ piglit_require_gl_version(15);
glShadeModel(GL_FLAT);
glClearColor(0.2, 0.2, 0.2, 1.0);
diff --git a/tests/general/draw-vertices-half-float.c b/tests/general/draw-vertices-half-float.c
index b81b19c27..c962ebf1c 100644
--- a/tests/general/draw-vertices-half-float.c
+++ b/tests/general/draw-vertices-half-float.c
@@ -51,10 +51,7 @@ void piglit_init(int argc, char **argv)
piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
- if (piglit_get_gl_version() < 15) {
- printf("Requires OpenGL 1.5\n");
- piglit_report_result(PIGLIT_SKIP);
- }
+ piglit_require_gl_version(15);
piglit_require_extension("GL_ARB_half_float_vertex");
glShadeModel(GL_FLAT);
diff --git a/tests/general/draw-vertices.c b/tests/general/draw-vertices.c
index 03d602e24..70f1bd7fe 100644
--- a/tests/general/draw-vertices.c
+++ b/tests/general/draw-vertices.c
@@ -51,10 +51,7 @@ void piglit_init(int argc, char **argv)
piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
- if (piglit_get_gl_version() < 15) {
- printf("Requires OpenGL 1.5\n");
- piglit_report_result(PIGLIT_SKIP);
- }
+ piglit_require_gl_version(15);
glShadeModel(GL_FLAT);
glClearColor(0.2, 0.2, 0.2, 1.0);
diff --git a/tests/general/early-z.c b/tests/general/early-z.c
index 036fe5281..99578968c 100644
--- a/tests/general/early-z.c
+++ b/tests/general/early-z.c
@@ -144,10 +144,7 @@ piglit_init(int argc, char **argv)
{
int i;
- if (piglit_get_gl_version() < 20) {
- printf("Requires OpenGL 2.0 / GLSL\n");
- piglit_report_result(PIGLIT_SKIP);
- }
+ piglit_require_gl_version(20);
shader[0] = piglit_compile_shader_text(GL_FRAGMENT_SHADER, fpFragDepthText);
assert(shader[0]);
diff --git a/tests/general/isbufferobj.c b/tests/general/isbufferobj.c
index 45b3246b7..be2a09007 100644
--- a/tests/general/isbufferobj.c
+++ b/tests/general/isbufferobj.c
@@ -101,8 +101,5 @@ piglit_display(void)
void
piglit_init(int argc, char**argv)
{
- if (piglit_get_gl_version() < 15) {
- printf("Requires OpenGL 1.5\n");
- piglit_report_result(PIGLIT_SKIP);
- }
+ piglit_require_gl_version(15);
}
diff --git a/tests/general/occlusion-query-discard.c b/tests/general/occlusion-query-discard.c
index 4cf3de93d..144f70bca 100644
--- a/tests/general/occlusion-query-discard.c
+++ b/tests/general/occlusion-query-discard.c
@@ -128,10 +128,7 @@ piglit_init(int argc, char **argv)
{
GLint query_bits;
- if (piglit_get_gl_version() < 20) {
- printf("Requires OpenGL 2.0\n");
- piglit_report_result(PIGLIT_SKIP);
- }
+ piglit_require_gl_version(20);
/* It is legal for a driver to support the query API but not have
* any query bits. I wonder how many applications actually check for
diff --git a/tests/general/texunits.c b/tests/general/texunits.c
index 01264c942..cfe801237 100644
--- a/tests/general/texunits.c
+++ b/tests/general/texunits.c
@@ -384,10 +384,7 @@ init(void)
void
piglit_init(int argc, char *argv[])
{
- if (piglit_get_gl_version() < 13) {
- printf("Requires OpenGL 1.3\n");
- piglit_report_result(PIGLIT_SKIP);
- }
+ piglit_require_gl_version(13);
init();
}
diff --git a/tests/general/vao-element-array-buffer.c b/tests/general/vao-element-array-buffer.c
index 6e9f8c05a..103f24778 100644
--- a/tests/general/vao-element-array-buffer.c
+++ b/tests/general/vao-element-array-buffer.c
@@ -69,10 +69,7 @@ piglit_init(int argc, char **argv)
};
GLubyte indices[] = {0, 1, 2, 3};
- if (piglit_get_gl_version() < 15) {
- printf("Requires OpenGL 1.5\n");
- piglit_report_result(PIGLIT_SKIP);
- }
+ piglit_require_gl_version(15);
piglit_require_extension("GL_ARB_vertex_array_object");
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-13 14:28:39 +0000