Mesa (master): mesa/es3.1: Allow Multisampled FrameBufferTextures

[Tapani Pälli]

Module: Mesa
Branch: master
Commit: 08f2dfe3430789085c165ce7c546d5afd2e295c2
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=08f2dfe3430789085c165ce7c546d5afd2e295c2

Author: Marta Lofstedt <marta.lofstedt at intel.com>
Date:   Mon Aug 10 13:48:11 2015 +0300

mesa/es3.1: Allow Multisampled FrameBufferTextures

GLES 3.1 must be allowed to use multisampled framebuffer textures.

Signed-off-by: Marta Lofstedt <marta.lofstedt at intel.com>
Reviewed-by: Tapani Pälli <tapani.palli 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 cc342c2..8418340 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -2944,8 +2944,9 @@ check_textarget(struct gl_context *ctx, int dims, GLenum target,
          break;
       case GL_TEXTURE_2D_MULTISAMPLE:
       case GL_TEXTURE_2D_MULTISAMPLE_ARRAY:
-         err = _mesa_is_gles(ctx)
-               || !ctx->Extensions.ARB_texture_multisample;
+         err = (_mesa_is_gles(ctx) ||
+                !ctx->Extensions.ARB_texture_multisample) &&
+               !_mesa_is_gles31(ctx);
          break;
       default:
          err = true;