[Piglit] [PATCH 2/6] fbo: Require ARB_texture_non_power_of_two in some tests that implicitly require it

Ian Romanick idr at freedesktop.org
Mon Oct 10 22:51:34 UTC 2016


From: Ian Romanick <ian.d.romanick at intel.com>

Each of these tests requires either EXT_draw_buffers2, ARB_texture_rg,
or >= 2 render targets.  I know of no hardware or driver that ever
supported any of that functionality and not
ARB_texture_non_power_of_two also.

Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
---
 tests/fbo/fbo-drawbuffers-arbfp.c      | 1 +
 tests/fbo/fbo-drawbuffers.c            | 1 +
 tests/fbo/fbo-drawbuffers2-blend.c     | 1 +
 tests/fbo/fbo-drawbuffers2-colormask.c | 1 +
 tests/fbo/fbo-rg.c                     | 1 +
 5 files changed, 5 insertions(+)

diff --git a/tests/fbo/fbo-drawbuffers-arbfp.c b/tests/fbo/fbo-drawbuffers-arbfp.c
index a4e6b96..9135f39 100644
--- a/tests/fbo/fbo-drawbuffers-arbfp.c
+++ b/tests/fbo/fbo-drawbuffers-arbfp.c
@@ -152,6 +152,7 @@ piglit_init(int argc, char **argv)
 	piglit_require_extension("GL_ARB_draw_buffers");
 	piglit_require_extension("GL_ARB_fragment_program");
 	piglit_require_extension("GL_ARB_vertex_program");
+	piglit_require_extension("GL_ARB_texture_non_power_of_two");
 
 	glGetIntegerv(GL_MAX_DRAW_BUFFERS_ARB, &num);
 	if (num < 2)
diff --git a/tests/fbo/fbo-drawbuffers.c b/tests/fbo/fbo-drawbuffers.c
index 261bcc7..35bfcab 100644
--- a/tests/fbo/fbo-drawbuffers.c
+++ b/tests/fbo/fbo-drawbuffers.c
@@ -162,6 +162,7 @@ piglit_init(int argc, char **argv)
 
 	piglit_require_extension("GL_EXT_framebuffer_object");
 	piglit_require_extension("GL_ARB_draw_buffers");
+	piglit_require_extension("GL_ARB_texture_non_power_of_two");
 
 	glGetIntegerv(GL_MAX_DRAW_BUFFERS_ARB, &num);
 	if (num < 2)
diff --git a/tests/fbo/fbo-drawbuffers2-blend.c b/tests/fbo/fbo-drawbuffers2-blend.c
index 33d17ec..aad14ed 100644
--- a/tests/fbo/fbo-drawbuffers2-blend.c
+++ b/tests/fbo/fbo-drawbuffers2-blend.c
@@ -148,6 +148,7 @@ piglit_init(int argc, char **argv)
 	piglit_require_extension("GL_EXT_framebuffer_object");
 	piglit_require_extension("GL_ARB_draw_buffers");
 	piglit_require_extension("GL_EXT_draw_buffers2");
+	piglit_require_extension("GL_ARB_texture_non_power_of_two");
 
 	glGetIntegerv(GL_MAX_DRAW_BUFFERS_ARB, &num);
 	if (num < 2)
diff --git a/tests/fbo/fbo-drawbuffers2-colormask.c b/tests/fbo/fbo-drawbuffers2-colormask.c
index abb7738..66ecc7e 100644
--- a/tests/fbo/fbo-drawbuffers2-colormask.c
+++ b/tests/fbo/fbo-drawbuffers2-colormask.c
@@ -161,6 +161,7 @@ piglit_init(int argc, char **argv)
 	piglit_require_extension("GL_EXT_framebuffer_object");
 	piglit_require_extension("GL_ARB_draw_buffers");
 	piglit_require_extension("GL_EXT_draw_buffers2");
+	piglit_require_extension("GL_ARB_texture_non_power_of_two");
 
 	glGetIntegerv(GL_MAX_DRAW_BUFFERS_ARB, &num);
 	if (num < 2)
diff --git a/tests/fbo/fbo-rg.c b/tests/fbo/fbo-rg.c
index ad998c2..d638916 100644
--- a/tests/fbo/fbo-rg.c
+++ b/tests/fbo/fbo-rg.c
@@ -249,6 +249,7 @@ render_and_check_textures(GLenum internal_format)
 
 	piglit_require_extension("GL_EXT_framebuffer_object");
 	piglit_require_extension("GL_ARB_texture_rg");
+	piglit_require_extension("GL_ARB_texture_non_power_of_two");
 
 	has_green = GL_FALSE;
 	scale = 1.0;
-- 
2.5.5



More information about the Piglit mailing list