mesa/es3.1: Allow multisampled textures for GLES 3.1
authorMarta Lofstedt <marta.lofstedt@intel.com>
Mon, 11 May 2015 13:03:56 +0000 (15:03 +0200)
committerTapani Pälli <tapani.palli@intel.com>
Mon, 3 Aug 2015 09:32:30 +0000 (12:32 +0300)
GLES 3.1 must be allowed to create multisampled textures.

Signed-off-by: Marta Lofstedt <marta.lofstedt@intel.com>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
src/mesa/main/teximage.c

index a719c1c5d4cc3b214b0fcee5cd763f6a8f801119..841ec3640204e4306ee2ea542f2e1dc7ed10503f 100644 (file)
@@ -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;
    }