On 3 December 2014 at 22:04, Emil Velikov <[email protected]> wrote: > On 03/12/14 14:44, Brian Paul wrote: >> On 12/03/2014 06:37 AM, Emil Velikov wrote: >>> The test itself is written against the ARB extension, and neither the >>> test or the ARB extension requires the EXT one. >>> >>> Signed-off-by: Emil Velikov <[email protected]> >>> --- >>> >>> It's unlikely that anyone will hit this (i.e. has support for ARB but >>> lacks the EXT extension) but from a quick look at the spec it seems >>> like the correct thing to do. >>> >>> -Emil >>> >>> tests/spec/ext_timer_query/time-elapsed.c | 4 ++-- >>> 1 file changed, 2 insertions(+), 2 deletions(-) >>> >>> diff --git a/tests/spec/ext_timer_query/time-elapsed.c >>> b/tests/spec/ext_timer_query/time-elapsed.c >>> index 3085c67..65a9301 100644 >>> --- a/tests/spec/ext_timer_query/time-elapsed.c >>> +++ b/tests/spec/ext_timer_query/time-elapsed.c >>> @@ -292,10 +292,10 @@ piglit_init(int argc, char **argv) >>> prog = piglit_build_simple_program(vs_text, fs_text); >>> iters_loc = glGetUniformLocation(prog, "iters"); >>> >>> - piglit_require_extension("GL_EXT_timer_query"); >>> - >>> if (argc == 2 && strcmp(argv[1], "timestamp") == 0) { >>> piglit_require_extension("GL_ARB_timer_query"); >>> test = TIMESTAMP; >>> + } else { >>> + piglit_require_extension("GL_EXT_timer_query"); >>> } >>> } >>> >> >> So what's supposed to happen if there's no "timestamp" argument? >> The test is invoked that way in all.py >> >> If the test isn't testing GL_EXT_timer_query, should the test be moved >> to tests/spec/arb_timer_query? >> > Afaict the test does both GL_EXT_timer_query and GL_ARB_timer_query, > with the latter being tested only when timestamp is present. Afaict > things are left as is as the actual test(s) are almost identical (~3 > lines diff). > > Chris, > Afaict you've added the test a while back. Does any of the above make > sense - the patch, having both GL_{ARB,EXT}_timer_query test(s) in the > same file ? > Gents, any input on this ?
Should we split the test into two - one for each extension, or just move the GL_EXT_timer_query only when appropriate ? Thanks Emil _______________________________________________ Piglit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/piglit
