diff options
| author | Eric Anholt <eric@anholt.net> | 2012-07-26 15:31:47 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2012-07-26 16:29:39 -0700 |
| commit | 6e45aa2aa2de34416a4c08a1f5816bbdd03206d9 (patch) | |
| tree | 9e03d2265982b8a3d38987746c8f31b77b93a01a | |
| parent | 15496b239a513da085e1c17736e38d61f1101a10 (diff) | |
GL_ARB_texture_buffer_object: Make some tests runnable on a 3.1 context.ubo
This doesn't actually run them on a core context, but they can now be
tested with MESA_GL_VERSION_OVERRIDE=3.1.
5 files changed, 10 insertions, 5 deletions
diff --git a/tests/spec/arb_texture_buffer_object/get.c b/tests/spec/arb_texture_buffer_object/get.c index ffbc4e131..b3ae8cffc 100644 --- a/tests/spec/arb_texture_buffer_object/get.c +++ b/tests/spec/arb_texture_buffer_object/get.c @@ -66,7 +66,8 @@ piglit_init(int argc, char **argv) GLuint tex, bo; piglit_require_gl_version(20); - piglit_require_extension("GL_ARB_texture_buffer_object"); + if (piglit_get_gl_version() < 31) + piglit_require_extension("GL_ARB_texture_buffer_object"); glGenTextures(1, &tex); glGenBuffers(1, &bo); diff --git a/tests/spec/arb_texture_buffer_object/minmax.c b/tests/spec/arb_texture_buffer_object/minmax.c index 22399c42a..bba675d0a 100644 --- a/tests/spec/arb_texture_buffer_object/minmax.c +++ b/tests/spec/arb_texture_buffer_object/minmax.c @@ -43,7 +43,8 @@ piglit_display(void) void piglit_init(int argc, char **argv) { - piglit_require_extension("GL_ARB_texture_buffer_object"); + if (piglit_get_gl_version() < 31) + piglit_require_extension("GL_ARB_texture_buffer_object"); piglit_print_minmax_header(); piglit_test_min_int(GL_MAX_TEXTURE_BUFFER_SIZE, 65536); diff --git a/tests/spec/arb_texture_buffer_object/negative-bad-bo.c b/tests/spec/arb_texture_buffer_object/negative-bad-bo.c index c1a2f748c..6abfc7074 100644 --- a/tests/spec/arb_texture_buffer_object/negative-bad-bo.c +++ b/tests/spec/arb_texture_buffer_object/negative-bad-bo.c @@ -47,7 +47,8 @@ piglit_init(int argc, char **argv) { GLuint tex; - piglit_require_extension("GL_ARB_texture_buffer_object"); + if (piglit_get_gl_version() < 31) + piglit_require_extension("GL_ARB_texture_buffer_object"); glGenTextures(1, &tex); glBindTexture(GL_TEXTURE_BUFFER, tex); diff --git a/tests/spec/arb_texture_buffer_object/negative-bad-format.c b/tests/spec/arb_texture_buffer_object/negative-bad-format.c index 601712170..80511c201 100644 --- a/tests/spec/arb_texture_buffer_object/negative-bad-format.c +++ b/tests/spec/arb_texture_buffer_object/negative-bad-format.c @@ -47,7 +47,8 @@ piglit_init(int argc, char **argv) { GLuint tex; - piglit_require_extension("GL_ARB_texture_buffer_object"); + if (piglit_get_gl_version() < 31) + piglit_require_extension("GL_ARB_texture_buffer_object"); glGenTextures(1, &tex); glBindTexture(GL_TEXTURE_BUFFER, tex); diff --git a/tests/spec/arb_texture_buffer_object/negative-bad-target.c b/tests/spec/arb_texture_buffer_object/negative-bad-target.c index 3885cd712..01dc6c192 100644 --- a/tests/spec/arb_texture_buffer_object/negative-bad-target.c +++ b/tests/spec/arb_texture_buffer_object/negative-bad-target.c @@ -52,7 +52,8 @@ piglit_init(int argc, char **argv) GLuint tex; int i; - piglit_require_extension("GL_ARB_texture_buffer_object"); + if (piglit_get_gl_version() < 31) + piglit_require_extension("GL_ARB_texture_buffer_object"); glGenTextures(1, &tex); glBindTexture(GL_TEXTURE_BUFFER, tex); |