[Mesa-dev] [PATCH v2] mesa/es3.1: Pass sample count check for multisampled textures

[Ian Romanick]

On 05/12/2015 01:46 AM, Marta Lofstedt wrote:
> From: Marta Lofstedt <marta.lofstedt at intel.com>
> 
> v2 : Refine the restriction to Version == 30.
> 
> Signed-off-by: Marta Lofstedt <marta.lofstedt at intel.com>
> ---
>  src/mesa/main/multisample.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/src/mesa/main/multisample.c b/src/mesa/main/multisample.c
> index 816837b..fec7a9f 100644
> --- a/src/mesa/main/multisample.c
> +++ b/src/mesa/main/multisample.c
> @@ -164,8 +164,11 @@ _mesa_check_sample_count(struct gl_context *ctx, GLenum target,
>      *
>      *     "If internalformat is a signed or unsigned integer format and samples
>      *     is greater than zero, then the error INVALID_OPERATION is generated."
> +    *
> +    * This restriction is relaxed for Open GL ES 3.1.

Remove the space between "Open" and "GL" and this patch is

Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

>      */
> -   if (_mesa_is_gles3(ctx) && _mesa_is_enum_format_integer(internalFormat)
> +   if ((ctx->API == API_OPENGLES2 && ctx->Version == 30) &&
> +       _mesa_is_enum_format_integer(internalFormat)
>         && samples > 0) {
>        return GL_INVALID_OPERATION;
>     }
>