From: Marta Lofstedt Date: Mon, 11 May 2015 13:03:52 +0000 (+0200) Subject: mesa/es3.1: Allow textures with target GL_TEXTURE_2D_MULTISAMPLE X-Git-Tag: upstream/17.1.0~17203 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d74645d3acc815f6129b4cb20e6570c127d5ab2b;p=platform%2Fupstream%2Fmesa.git mesa/es3.1: Allow textures with target GL_TEXTURE_2D_MULTISAMPLE GLES 3.1 should be able to bind a texture with the target GL_TEXTURE_2D_MULTISAMPLE. Signed-off-by: Marta Lofstedt Reviewed-by: Tapani Pälli --- diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c index 949eef0..a719c1c 100644 --- a/src/mesa/main/teximage.c +++ b/src/mesa/main/teximage.c @@ -1008,7 +1008,7 @@ _mesa_max_texture_levels(struct gl_context *ctx, GLenum target) case GL_PROXY_TEXTURE_2D_MULTISAMPLE: case GL_TEXTURE_2D_MULTISAMPLE_ARRAY: case GL_PROXY_TEXTURE_2D_MULTISAMPLE_ARRAY: - return _mesa_is_desktop_gl(ctx) + return (_mesa_is_desktop_gl(ctx) || _mesa_is_gles31(ctx)) && ctx->Extensions.ARB_texture_multisample ? 1 : 0; case GL_TEXTURE_EXTERNAL_OES: diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c index 094c3a6..cd7cfd6 100644 --- a/src/mesa/main/texobj.c +++ b/src/mesa/main/texobj.c @@ -1606,8 +1606,8 @@ _mesa_tex_target_to_index(const struct gl_context *ctx, GLenum target) return _mesa_is_desktop_gl(ctx) && ctx->Extensions.ARB_texture_cube_map_array ? TEXTURE_CUBE_ARRAY_INDEX : -1; case GL_TEXTURE_2D_MULTISAMPLE: - return _mesa_is_desktop_gl(ctx) && ctx->Extensions.ARB_texture_multisample - ? TEXTURE_2D_MULTISAMPLE_INDEX: -1; + return ((_mesa_is_desktop_gl(ctx) && ctx->Extensions.ARB_texture_multisample) || + _mesa_is_gles31(ctx)) ? TEXTURE_2D_MULTISAMPLE_INDEX: -1; case GL_TEXTURE_2D_MULTISAMPLE_ARRAY: return _mesa_is_desktop_gl(ctx) && ctx->Extensions.ARB_texture_multisample ? TEXTURE_2D_MULTISAMPLE_ARRAY_INDEX: -1;