[Mesa-dev] [PATCH 6/9] mesa/es3.1: Allow Multisampled FrameBufferTextures

[Erik Faye-Lund]

On Mon, May 11, 2015 at 3:03 PM, Marta Lofstedt
<marta.lofstedt at linux.intel.com> wrote:
> From: Marta Lofstedt <marta.lofstedt at intel.com>
>
> GLES 3.1 must be allowed to use multisampled
> frambuffer textures.
>
> Signed-off-by: Marta Lofstedt <marta.lofstedt at intel.com>
> ---
>  src/mesa/main/fbobject.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
> index 27cf97f..14a015e 100644
> --- a/src/mesa/main/fbobject.c
> +++ b/src/mesa/main/fbobject.c
> @@ -2756,8 +2756,9 @@ _mesa_FramebufferTexture2D(GLenum target, GLenum attachment,
>           break;
>        case GL_TEXTURE_2D_MULTISAMPLE:
>        case GL_TEXTURE_2D_MULTISAMPLE_ARRAY:
> -         error = _mesa_is_gles(ctx)
> -            || !ctx->Extensions.ARB_texture_multisample;
> +         error = (_mesa_is_gles(ctx)
> +            || !ctx->Extensions.ARB_texture_multisample) &&
> +            !_mesa_is_gles31(ctx);
>           break;
>        default:
>           error = GL_TRUE;

Shouldn't this be like this instead (and make sure
ARB_texture_multisample is enabled for ES3.1)?

@@ -2756,8 +2756,9 @@ _mesa_FramebufferTexture2D(GLenum target, GLenum
attachment,
          break;
       case GL_TEXTURE_2D_MULTISAMPLE:
       case GL_TEXTURE_2D_MULTISAMPLE_ARRAY:
-         error = _mesa_is_gles(ctx)
-            || !ctx->Extensions.ARB_texture_multisample;
+         error = !ctx->Extensions.ARB_texture_multisample;
          break;
       default:
          error = GL_TRUE;