On Fri, Mar 8, 2013 at 3:01 PM, Matt Turner <matts...@gmail.com> wrote:
> Fixes piglit's oes_compressed_etc2_texture-miptree tests on Desktop GL.
> Reported-by: Marek Olšák <mar...@gmail.com>
> ---
> src/mesa/main/glformats.c | 2 +-
> src/mesa/main/teximage.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/src/mesa/main/glformats.c b/src/mesa/main/glformats.c
> index 8728540..c1e1658 100644
> --- a/src/mesa/main/glformats.c
> +++ b/src/mesa/main/glformats.c
> @@ -917,7 +917,7 @@ _mesa_is_compressed_format(struct gl_context *ctx, GLenum
> format)
> case GL_COMPRESSED_SIGNED_RG11_EAC:
> case GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2:
> case GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2:
> - return _mesa_is_gles3(ctx);
> + return _mesa_is_gles3(ctx) || ctx->Extensions.ARB_ES3_compatibility;
> case GL_PALETTE4_RGB8_OES:
> case GL_PALETTE4_RGBA8_OES:
> case GL_PALETTE4_R5_G6_B5_OES:
> diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
> index 9d4a170..7d996da 100644
> --- a/src/mesa/main/teximage.c
> +++ b/src/mesa/main/teximage.c
> @@ -520,7 +520,7 @@ _mesa_base_tex_format( struct gl_context *ctx, GLint
> internalFormat )
> }
> }
>
> - if (_mesa_is_gles3(ctx)) {
> + if (_mesa_is_gles3(ctx) || ctx->Extensions.ARB_ES3_compatibility) {
> switch (internalFormat) {
> case GL_COMPRESSED_RGB8_ETC2:
> case GL_COMPRESSED_SRGB8_ETC2:
> --
> 1.7.8.6
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Reviewed-by: Anuj Phogat <anuj.pho...@gmail.com>
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
