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

Eric Anholt eric at anholt.net
Tue Dec 11 16:28:19 PST 2012


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 :(


> +			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.

Other than the version 30 comment, though, it gets my r-b.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/piglit/attachments/20121211/1d097ee7/attachment.pgp>


More information about the Piglit mailing list