From: Marta Lofstedt Date: Mon, 11 May 2015 13:03:55 +0000 (+0200) Subject: mesa/es3.1: Allow query of GL_TEXTURE_MULTISAMPLE X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2253a296c9ad7b11f9844640024c5f0784e4e528;p=mesa.git mesa/es3.1: Allow query of GL_TEXTURE_MULTISAMPLE GLES 3.1 must allow a query for GL_TEXTURE_MULTISAMPLE. Signed-off-by: Marta Lofstedt Reviewed-by: Tapani Pälli --- diff --git a/src/mesa/main/formatquery.c b/src/mesa/main/formatquery.c index fe96d5b29fb..85f7b6b5664 100644 --- a/src/mesa/main/formatquery.c +++ b/src/mesa/main/formatquery.c @@ -74,7 +74,9 @@ _mesa_GetInternalformativ(GLenum target, GLenum internalformat, GLenum pname, case GL_TEXTURE_2D_MULTISAMPLE: case GL_TEXTURE_2D_MULTISAMPLE_ARRAY: /* These enums are only valid if ARB_texture_multisample is supported */ - if (_mesa_is_desktop_gl(ctx) && ctx->Extensions.ARB_texture_multisample) + if ((_mesa_is_desktop_gl(ctx) && + ctx->Extensions.ARB_texture_multisample) || + _mesa_is_gles31(ctx)) break; default: