[Mesa-dev] [PATCH] mesa/main: TexImage2DMultisample needs to pass OpenGL3.3 conformance test.

[Tapani Pälli]

Hi;

On 11/25/2015 01:15 PM, Marius Predut wrote:
> Open GL 3.3 reference document says:
> samples must be in the range zero to GL_MAX_TEXTURE_SIZE - 1.
> Open GL.4 clearly states:
> An INVALID_VALUE error is generated if samples is zero.

OpenGL ES 3.1 spec also says "An INVALID_VALUE error is generated if 
samples is zero.". You'll need to change you check below to include also 
ES 3.1.

> Fixing the piglit test case gl-3.2-layered-rendering-framebuffertexture.
>
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93100
>
> Signed-off-by: Marius Predut <marius.predut at intel.com>
> ---
>   src/mesa/main/teximage.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
> index d9453e3..69634ff 100644
> --- a/src/mesa/main/teximage.c
> +++ b/src/mesa/main/teximage.c
> @@ -5211,7 +5211,7 @@ texture_image_multisample(struct gl_context *ctx, GLuint dims,
>         return;
>      }
>   
> -   if (samples < 1) {
> +   if (samples < 1 && ctx->API == API_OPENGL_CORE && ctx->Version >= 40) {
>         _mesa_error(ctx, GL_INVALID_VALUE, "%s(samples < 1)", func);
>         return;
>      }