These tests shouldn't require OpenGL 2.0; NV_conditional_render itself
requires either OpenGL 1.5 or ARB_occlusion_query, but requiring
NV_conditional_render should be enough for these tests.
Signed-off-by: Erik Faye-Lund <erik.faye-l...@collabora.com>
---
tests/spec/nv_conditional_render/begin-while-active.c | 3 ---
tests/spec/nv_conditional_render/begin-zero.c | 2 --
tests/spec/nv_conditional_render/bitmap.c | 2 --
tests/spec/nv_conditional_render/blitframebuffer.c | 2 --
tests/spec/nv_conditional_render/clear.c | 2 --
tests/spec/nv_conditional_render/copypixels.c | 2 --
tests/spec/nv_conditional_render/copyteximage.c | 2 --
tests/spec/nv_conditional_render/copytexsubimage.c | 2 --
tests/spec/nv_conditional_render/dlist.c | 2 --
tests/spec/nv_conditional_render/drawpixels.c | 2 --
tests/spec/nv_conditional_render/generatemipmap.c | 2 --
tests/spec/nv_conditional_render/vertex_array.c | 2 --
12 files changed, 25 deletions(-)
diff --git a/tests/spec/nv_conditional_render/begin-while-active.c
b/tests/spec/nv_conditional_render/begin-while-active.c
index f80409a5d..821544113 100644
--- a/tests/spec/nv_conditional_render/begin-while-active.c
+++ b/tests/spec/nv_conditional_render/begin-while-active.c
@@ -59,9 +59,6 @@ void
piglit_init(int argc, char **argv)
{
GLuint q;
-
- piglit_require_gl_version(20);
-
piglit_require_extension("GL_NV_conditional_render");
glGenQueries(1, &q);
diff --git a/tests/spec/nv_conditional_render/begin-zero.c
b/tests/spec/nv_conditional_render/begin-zero.c
index c96cccdb6..85304643c 100644
--- a/tests/spec/nv_conditional_render/begin-zero.c
+++ b/tests/spec/nv_conditional_render/begin-zero.c
@@ -55,8 +55,6 @@ piglit_display(void)
void
piglit_init(int argc, char **argv)
{
- piglit_require_gl_version(20);
-
piglit_require_extension("GL_NV_conditional_render");
glBeginConditionalRenderNV(0, GL_QUERY_WAIT_NV);
diff --git a/tests/spec/nv_conditional_render/bitmap.c
b/tests/spec/nv_conditional_render/bitmap.c
index dc1c58a47..e3954c919 100644
--- a/tests/spec/nv_conditional_render/bitmap.c
+++ b/tests/spec/nv_conditional_render/bitmap.c
@@ -102,7 +102,5 @@ piglit_display(void)
void
piglit_init(int argc, char **argv)
{
- piglit_require_gl_version(20);
-
piglit_require_extension("GL_NV_conditional_render");
}
diff --git a/tests/spec/nv_conditional_render/blitframebuffer.c
b/tests/spec/nv_conditional_render/blitframebuffer.c
index 06e5c7d81..db45bb2c6 100644
--- a/tests/spec/nv_conditional_render/blitframebuffer.c
+++ b/tests/spec/nv_conditional_render/blitframebuffer.c
@@ -135,8 +135,6 @@ piglit_display(void)
void
piglit_init(int argc, char **argv)
{
- piglit_require_gl_version(20);
-
piglit_require_extension("GL_NV_conditional_render");
piglit_require_extension("GL_EXT_framebuffer_object");
piglit_require_extension("GL_EXT_framebuffer_blit");
diff --git a/tests/spec/nv_conditional_render/clear.c
b/tests/spec/nv_conditional_render/clear.c
index e6136e633..288239d06 100644
--- a/tests/spec/nv_conditional_render/clear.c
+++ b/tests/spec/nv_conditional_render/clear.c
@@ -95,7 +95,5 @@ piglit_display(void)
void
piglit_init(int argc, char **argv)
{
- piglit_require_gl_version(20);
-
piglit_require_extension("GL_NV_conditional_render");
}
diff --git a/tests/spec/nv_conditional_render/copypixels.c
b/tests/spec/nv_conditional_render/copypixels.c
index 5a6c30d99..6bb3ff8a8 100644
--- a/tests/spec/nv_conditional_render/copypixels.c
+++ b/tests/spec/nv_conditional_render/copypixels.c
@@ -98,7 +98,5 @@ piglit_display(void)
void
piglit_init(int argc, char **argv)
{
- piglit_require_gl_version(20);
-
piglit_require_extension("GL_NV_conditional_render");
}
diff --git a/tests/spec/nv_conditional_render/copyteximage.c
b/tests/spec/nv_conditional_render/copyteximage.c
index 2a00c0293..46e2e38dd 100644
--- a/tests/spec/nv_conditional_render/copyteximage.c
+++ b/tests/spec/nv_conditional_render/copyteximage.c
@@ -119,7 +119,5 @@ piglit_display(void)
void
piglit_init(int argc, char **argv)
{
- piglit_require_gl_version(20);
-
piglit_require_extension("GL_NV_conditional_render");
}
diff --git a/tests/spec/nv_conditional_render/copytexsubimage.c
b/tests/spec/nv_conditional_render/copytexsubimage.c
index da8fc3ca9..c7f1a733b 100644
--- a/tests/spec/nv_conditional_render/copytexsubimage.c
+++ b/tests/spec/nv_conditional_render/copytexsubimage.c
@@ -119,7 +119,5 @@ piglit_display(void)
void
piglit_init(int argc, char **argv)
{
- piglit_require_gl_version(20);
-
piglit_require_extension("GL_NV_conditional_render");
}
diff --git a/tests/spec/nv_conditional_render/dlist.c
b/tests/spec/nv_conditional_render/dlist.c
index f77595366..d322c1c5d 100644
--- a/tests/spec/nv_conditional_render/dlist.c
+++ b/tests/spec/nv_conditional_render/dlist.c
@@ -90,7 +90,5 @@ piglit_display(void)
void
piglit_init(int argc, char **argv)
{
- piglit_require_gl_version(20);
-
piglit_require_extension("GL_NV_conditional_render");
}
diff --git a/tests/spec/nv_conditional_render/drawpixels.c
b/tests/spec/nv_conditional_render/drawpixels.c
index a22867223..ce32b8e1b 100644
--- a/tests/spec/nv_conditional_render/drawpixels.c
+++ b/tests/spec/nv_conditional_render/drawpixels.c
@@ -112,7 +112,5 @@ piglit_display(void)
void
piglit_init(int argc, char **argv)
{
- piglit_require_gl_version(20);
-
piglit_require_extension("GL_NV_conditional_render");
}
diff --git a/tests/spec/nv_conditional_render/generatemipmap.c
b/tests/spec/nv_conditional_render/generatemipmap.c
index 1953e3dbf..315d2d7e1 100644
--- a/tests/spec/nv_conditional_render/generatemipmap.c
+++ b/tests/spec/nv_conditional_render/generatemipmap.c
@@ -123,8 +123,6 @@ piglit_display(void)
void
piglit_init(int argc, char **argv)
{
- piglit_require_gl_version(20);
-
piglit_require_extension("GL_NV_conditional_render");
piglit_require_extension("GL_EXT_framebuffer_object");
}
diff --git a/tests/spec/nv_conditional_render/vertex_array.c
b/tests/spec/nv_conditional_render/vertex_array.c
index 2c19fb460..4c5ed25f9 100644
--- a/tests/spec/nv_conditional_render/vertex_array.c
+++ b/tests/spec/nv_conditional_render/vertex_array.c
@@ -95,7 +95,5 @@ piglit_display(void)
void
piglit_init(int argc, char **argv)
{
- piglit_require_gl_version(20);
-
piglit_require_extension("GL_NV_conditional_render");
}
--
2.19.1
_______________________________________________
Piglit mailing list
Piglit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/piglit
