[Piglit] [PATCH 01/21] arb_internalformat_query: remove references to arb_internalformat_query2

[Alejandro Piñeiro]

On 22/01/16 18:08, Ian Romanick wrote:
> On 01/22/2016 08:05 AM, Alejandro Piñeiro wrote:
>> arb_internalformat_query tests was taking into account query2, in
>> order to avoid testing some pnames/internalformats valid on query2.
>>
>> But taking into account how deeply arb_internalformat_query2 extended
>> and changed the behaviour of GetInternalformativ, it is really more
>> clear to isolate both.
>>
>> With this commit arb_internalformat_query tests will test when only
>> arb_internalformat_query is present, and arb_internalformat_query2
>> will test when both are present (as arb_internalformat_query2 has
>> arb_internalformat_query as a requirement).
>>
>> This patch makes this one obsolete:
>> http://lists.freedesktop.org/archives/piglit/2015-October/017746.html
>> ---
>>  tests/spec/arb_internalformat_query/api-errors.c | 35 ++----------------------
>>  tests/spec/arb_internalformat_query/minmax.c     |  3 ++
>>  2 files changed, 6 insertions(+), 32 deletions(-)
>>
>> diff --git a/tests/spec/arb_internalformat_query/api-errors.c b/tests/spec/arb_internalformat_query/api-errors.c
>> index ee21c17..a174143 100644
>> --- a/tests/spec/arb_internalformat_query/api-errors.c
>> +++ b/tests/spec/arb_internalformat_query/api-errors.c
>> @@ -63,9 +63,6 @@ static const GLenum invalid_targets[] = {
>>  	GL_STENCIL_ATTACHMENT,
>>  	GL_TEXTURE_4D_SGIS,
>>  	GL_TEXTURE_RENDERBUFFER_NV,
>> -};
>> -
>> -static const GLenum invalid_targets_without_query2[] = {
>>  	GL_TEXTURE_1D,
>>  	GL_TEXTURE_1D_ARRAY,
>>  	GL_TEXTURE_2D,
>> @@ -152,9 +149,6 @@ static const GLenum invalid_pnames[] = {
>>  	GL_TEXTURE_WIDTH,
>>  	GL_TEXTURE_HEIGHT,
>>  	GL_TEXTURE_COMPONENTS,
>> -};
>> -
>> -static const GLenum invalid_pnames_without_query2[] = {
>>  	GL_INTERNALFORMAT_SUPPORTED,
>>  	GL_INTERNALFORMAT_PREFERRED,
>>  	GL_INTERNALFORMAT_RED_SIZE,
>> @@ -285,6 +279,9 @@ piglit_init(int argc, char **argv)
>>  
>>  	piglit_require_extension("GL_ARB_framebuffer_object");
>>  	piglit_require_extension("GL_ARB_internalformat_query");
>> +        /* ARB_internalformat_query2 redefines and extend this
>> +         * extension. That extension have their own tests*/
>> +        piglit_require_not_extension("GL_ARB_internalformat_query2");
>>  
>>  	/* The GL_ARB_internalformat_query spec says:
>>  	 *
>> @@ -310,22 +307,7 @@ piglit_init(int argc, char **argv)
>>  	 *     then TEXTURE_2D_MULTISAMPLE and TEXTURE_2D_MULTISAMPLE_ARRAY
>>  	 *     are not supported <target> parameters to GetInternalformativ."
>>  	 *
>> -	 * However, GL_ARB_internalformat_query2 adds GL_TEXTURE_1D,
>> -	 * GL_TEXTURE_1D_ARRAY, GL_TEXTURE_2D, GL_TEXTURE_2D_ARRAY,
>> -	 * GL_TEXTURE_3D, GL_TEXTURE_CUBE_MAP, GL_TEXTURE_CUBE_MAP_ARRAY,
>> -	 * GL_TEXTURE_RECTANGLE, and GL_TEXTURE_BUFFER to the list of
>> -	 * available targets.
>> -	 *
>>  	 */
>> -	if (!piglit_is_extension_supported("GL_ARB_internalformat_query2")) {
>> -		pass = try(invalid_targets_without_query2,
>> -			   ARRAY_SIZE(invalid_targets_without_query2),
>> -			   valid_formats, ARRAY_SIZE(valid_formats),
>> -			   valid_pnames, ARRAY_SIZE(valid_pnames),
>> -			   GL_INVALID_ENUM)
>> -			&& pass;
>> -	}
>> -
>>  	if (!piglit_is_extension_supported("GL_ARB_texture_multisample")) {
>>  		pass = try(invalid_targets_without_tms,
>>  			   ARRAY_SIZE(invalid_targets_without_tms),
>> @@ -346,18 +328,7 @@ piglit_init(int argc, char **argv)
>>  	 *     "If the <pname> parameter to GetInternalformativ is not SAMPLES
>>  	 *     or NUM_SAMPLE_COUNTS, then an INVALID_ENUM error is generated."
>>  	 *
>> -	 * However, GL_ARB_internalformat_query2 adds a giant pile of possible
>> -	 * enums to this list.
>>  	 */
>> -	if (!piglit_is_extension_supported("GL_ARB_internalformat_query2")) {
>> -		pass = try(valid_targets, ARRAY_SIZE(valid_targets),
>> -			   valid_formats, ARRAY_SIZE(valid_formats),
>> -			   invalid_pnames_without_query2,
>> -			   ARRAY_SIZE(invalid_pnames_without_query2),
>> -			   GL_INVALID_ENUM)
>> -			&& pass;
>> -	}
>> -
>>  	pass = try(valid_targets, ARRAY_SIZE(valid_targets),
>>  		   valid_formats, ARRAY_SIZE(valid_formats),
>>  		   invalid_pnames, ARRAY_SIZE(invalid_pnames),
>> diff --git a/tests/spec/arb_internalformat_query/minmax.c b/tests/spec/arb_internalformat_query/minmax.c
>> index 9a9d8f6..5fa2ffb 100644
>> --- a/tests/spec/arb_internalformat_query/minmax.c
>> +++ b/tests/spec/arb_internalformat_query/minmax.c
>> @@ -242,6 +242,9 @@ piglit_init(int argc, char **argv)
>>  
>>  	piglit_require_extension("GL_ARB_framebuffer_object");
>>  	piglit_require_extension("GL_ARB_internalformat_query");
>> +        /* ARB_internalformat_query2 redefines and extend this
>> +         * extension. That extension have their own tests*/
> Blank line before the comment, and the */ goes on its own line.

Ok.

>> +        piglit_require_not_extension("GL_ARB_internalformat_query2");
> Does this test actually fail in the presence of
> GL_ARB_internalformat_query2?

True, minmax and overrun tests still passes with the presence of
GL_ARB_internalformat_query2 (as overrun). api-errors fails though.

Do you prefer to only skip query1 api-errors?

BR

-- 
Alejandro Piñeiro (apinheiro at igalia.com)