[Mesa-dev] [PATCH 03/16] main: fix the validation of the number of samples

[Martin Peres]

Bump. I would really like to push this series ASAP and I only have a few 
patches without R-b.

On 16/02/15 16:13, Martin Peres wrote:
> Maybe this should be the job of the dispatch layer.
>
> Signed-off-by: Martin Peres <martin.peres at linux.intel.com>
> ---
>   src/mesa/main/multisample.c | 9 +++++++++
>   1 file changed, 9 insertions(+)
>
> diff --git a/src/mesa/main/multisample.c b/src/mesa/main/multisample.c
> index 1f3fa0c..a0a659b 100644
> --- a/src/mesa/main/multisample.c
> +++ b/src/mesa/main/multisample.c
> @@ -150,6 +150,15 @@ GLenum
>   _mesa_check_sample_count(struct gl_context *ctx, GLenum target,
>                            GLenum internalFormat, GLsizei samples)
>   {
> +   /* From the OpenGL core 3.0 spec, section 2.5:

The comment has been fixed locally to read:

Section 2.5 (GL Errors) of OpenGL 3.0 specification, page 16:

http://cgit.freedesktop.org/~mperes/mesa/commit/?h=dsa&id=faa9ef63d801f11a96f444aee083d9fac95a039d

> +    *
> +    * "If a negative number is provided where an argument of type sizei or
> +    * sizeiptr is specified, the error INVALID VALUE is generated."
> +    */
> +   if (samples < 0) {
> +      return GL_INVALID_VALUE;
> +   }
> +
>      /* If ARB_internalformat_query is supported, then treat its highest
>       * returned sample count as the absolute maximum for this format; it is
>       * allowed to exceed MAX_SAMPLES.