[Piglit] [PATCH 6/9] arb_program_interface_query/resource-query: tess tests need subroutines

[Tapani Pälli]

On 06/24/2015 12:10 PM, Marek Olšák wrote:
> I don't think so. This patch fixes the test when tessellation is
> available but subroutines aren't.

OK, so it tests some different interfaces than the subroutine ones 
listed within the check. For me it just looks a bit weird, all the 
subroutine ones are catched already before so those should not be 
getting called unless you really have GL_ARB_shader_subroutine, 
everything else will if you have st.tcs_text || st.tes_text && 
GL_ARB_tessellation_shader. What is the actual failure? Does it fail for 
all the rest of interfaces expect subroutine ones or does it fail for 
subroutine ones?



> Marek
>
> On Wed, Jun 24, 2015 at 9:24 AM, Tapani Pälli <tapani.palli at intel.com> wrote:
>>
>>
>> On 06/16/2015 11:57 PM, Marek Olšák wrote:
>>>
>>> From: Marek Olšák <marek.olsak at amd.com>
>>>
>>> ---
>>>    tests/spec/arb_program_interface_query/resource-query.c | 3 ++-
>>>    1 file changed, 2 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/tests/spec/arb_program_interface_query/resource-query.c
>>> b/tests/spec/arb_program_interface_query/resource-query.c
>>> index 1db5585..c131891 100755
>>> --- a/tests/spec/arb_program_interface_query/resource-query.c
>>> +++ b/tests/spec/arb_program_interface_query/resource-query.c
>>> @@ -646,7 +646,8 @@ check_extensions(const struct subtest_t st)
>>>               st.programInterface == GL_TESS_CONTROL_SUBROUTINE_UNIFORM ||
>>>               st.programInterface == GL_TESS_EVALUATION_SUBROUTINE_UNIFORM
>>> ||
>>>               st.tcs_text || st.tes_text) &&
>>> -            !piglit_is_extension_supported("GL_ARB_tessellation_shader"))
>>> {
>>> +           (!piglit_is_extension_supported("GL_ARB_shader_subroutine") ||
>>> +
>>> !piglit_is_extension_supported("GL_ARB_tessellation_shader"))) {
>>
>>
>>
>> This same check is already made a few lines above. It first checks against
>> all enums that require subroutine and only then for tessellation.
>>
>>>                   return false;
>>>           }
>>>
>>>
>>
>> // Tapani