[Piglit] [PATCH 3/3] arb_internalformat_query: Verify minimum maximums

[Ian Romanick]

On 12/11/2012 04:28 PM, Eric Anholt wrote:
> Ian Romanick <idr at freedesktop.org> writes:
>> +PIGLIT_GL_TEST_CONFIG_BEGIN
>> +
>> +	config.supports_gl_compat_version = 10;
>
> Same version 30 comment from the last one
>
>> +#ifndef GL_ARB_texture_multisample
>> +#define GL_SAMPLE_POSITION                0x8E50
>> +#define GL_SAMPLE_MASK                    0x8E51
>> +#define GL_SAMPLE_MASK_VALUE              0x8E52
>> +#define GL_MAX_SAMPLE_MASK_WORDS          0x8E59
>> +#define GL_TEXTURE_2D_MULTISAMPLE         0x9100
>> +#define GL_PROXY_TEXTURE_2D_MULTISAMPLE   0x9101
>> +#define GL_TEXTURE_2D_MULTISAMPLE_ARRAY   0x9102
>> +#define GL_PROXY_TEXTURE_2D_MULTISAMPLE_ARRAY 0x9103
>> +#define GL_TEXTURE_BINDING_2D_MULTISAMPLE 0x9104
>> +#define GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY 0x9105
>> +#define GL_TEXTURE_SAMPLES                0x9106
>> +#define GL_TEXTURE_FIXED_SAMPLE_LOCATIONS 0x9107
>> +#define GL_SAMPLER_2D_MULTISAMPLE         0x9108
>> +#define GL_INT_SAMPLER_2D_MULTISAMPLE     0x9109
>> +#define GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE 0x910A
>> +#define GL_SAMPLER_2D_MULTISAMPLE_ARRAY   0x910B
>> +#define GL_INT_SAMPLER_2D_MULTISAMPLE_ARRAY 0x910C
>> +#define GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY 0x910D
>> +#define GL_MAX_COLOR_TEXTURE_SAMPLES      0x910E
>> +#define GL_MAX_DEPTH_TEXTURE_SAMPLES      0x910F
>> +#define GL_MAX_INTEGER_SAMPLES            0x9110
>> +#endif
>
> I thought we'd got piglit so that it didn't need this crap any more, but
> looks like that's not the case :(

I forgot to remove this before sending the patch.  This is only 
necessary without the 'piglit-dispatch: Update enumext.spec from the 
registry' patch that I sent out on 12/7.

>> +			if (valid_targets_with_tms[i] == GL_RENDERBUFFER) {
>> +				glGetIntegerv(GL_MAX_SAMPLES, &max_samples);
>> +				max_samples_name = "GL_MAX_SAMPLES";
>> +			} else {
>> +				glGetIntegerv(GL_MAX_COLOR_TEXTURE_SAMPLES,
>> +					      &max_samples);
>> +				max_samples_name = "GL_MAX_COLOR_TEXTURE_SAMPLES";
>> +			}
>
> Some piglit_get_gl_enum_name might clean up a bit of the copy and paste
> in here.

Yes.

> Other than the version 30 comment, though, it gets my r-b.
>