Mesa (master): mesa/es3.1: Allow multisampled textures for GLES 3.1

[Tapani Pälli]

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

Author: Marta Lofstedt <marta.lofstedt at intel.com>
Date:   Mon May 11 15:03:56 2015 +0200

mesa/es3.1: Allow multisampled textures for GLES 3.1

GLES 3.1 must be allowed to create multisampled textures.

Signed-off-by: Marta Lofstedt <marta.lofstedt at intel.com>
Reviewed-by: Tapani Pälli <tapani.palli at intel.com>

---

 src/mesa/main/teximage.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index a719c1c..841ec36 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -5589,8 +5589,8 @@ _mesa_texture_image_multisample(struct gl_context *ctx, GLuint dims,
    GLenum sample_count_error;
    bool dsa = strstr(func, "ture") ? true : false;
 
-   if (!(ctx->Extensions.ARB_texture_multisample
-      && _mesa_is_desktop_gl(ctx))) {
+   if (!((ctx->Extensions.ARB_texture_multisample
+         && _mesa_is_desktop_gl(ctx))) && !_mesa_is_gles31(ctx)) {
       _mesa_error(ctx, GL_INVALID_OPERATION, "%s(unsupported)", func);
       return;
    }