[Piglit] [PATCH v2 2/3] arb_texture_storage: Update test requirements

[Matt Turner]

On Wed, Oct 16, 2013 at 4:43 PM, Ian Romanick <idr at freedesktop.org> wrote:
> On 10/16/2013 04:38 PM, Matt Turner wrote:
>> On Wed, Oct 16, 2013 at 3:51 PM, Ian Romanick <idr at freedesktop.org> wrote:
>>> From: Ian Romanick <ian.d.romanick at intel.com>
>>>
>>> The test uses 3D textures which were not part of OpenGL until 1.2.  This
>>> doesn't matter much in practice because the Linux OpenGL ABI requires at
>>> least OpenGL 1.2.  Change the minimum GL version from 1.0 to 1.2.
>>>
>>> Also, require GL_ARB_texture_cube_map for "cube texture" subtest.
>>>
>>> v2: Add the GL_ARB_texture_cube_map requirement.
>>>
>>> Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
>>> Cc: Brian Paul <brianp at vmware.com>
>>> ---
>>>  tests/spec/arb_texture_storage/texture-storage.c | 7 +++++--
>>>  1 file changed, 5 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/tests/spec/arb_texture_storage/texture-storage.c b/tests/spec/arb_texture_storage/texture-storage.c
>>> index 8cafe3c..5b4466c 100644
>>> --- a/tests/spec/arb_texture_storage/texture-storage.c
>>> +++ b/tests/spec/arb_texture_storage/texture-storage.c
>>> @@ -32,7 +32,7 @@
>>>
>>>  PIGLIT_GL_TEST_CONFIG_BEGIN
>>>
>>> -       config.supports_gl_compat_version = 10;
>>> +       config.supports_gl_compat_version = 12;
>>>
>>>         config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE;
>>>
>>> @@ -551,7 +551,10 @@ piglit_display(void)
>>>         X(test_2d_mipmap_rendering(), "2D mipmap rendering");
>>>         X(test_internal_formats(), "internal formats");
>>>         X(test_immutablity(GL_TEXTURE_2D), "immutability");
>>> -       X(test_cube_texture(), "cube texture");
>>> +
>>> +       if (piglit_is_extension_supported("GL_ARB_texture_cube_map"))
>>> +               X(test_cube_texture(), "cube texture");
>>> +
>>>         if (piglit_is_extension_supported("GL_ARB_texture_cube_map_array")) {
>>>                 X(test_cube_array_texture(), "cube array texture");
>>>         }
>>> --
>>> 1.8.1.4
>>
>> Can we return PIGLIT_SKIP for a subtest? That seems better than not
>> reporting anything.
>
> The subtest can say skip, but that shouldn't affect the result of the
> test as a whole.  I guess the right thing to do is more like:
>
>         if (piglit_is_extension_supported("GL_ARB_texture_cube_map"))
>                 X(test_cube_texture(), "cube texture");
>         else
>                 piglit_report_subtest_result(PIGLIT_SKIP, "cube texture");
>
> And similar for the cube array texture test.
>
> Would that work?

Yeah, that seems perfect.