From: Ilia Mirkin Date: Fri, 8 Jul 2016 03:46:28 +0000 (-0400) Subject: st/mesa: return appropriate mesa format for ETC texture formats X-Git-Tag: upstream/17.1.0~8175 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=00d4315d37ec736fccfee50a402fa2a929054bde;p=platform%2Fupstream%2Fmesa.git st/mesa: return appropriate mesa format for ETC texture formats Even when the backend driver does not support ETC formats, we handle the decoding into an uncompressed backing texture. However as far as core mesa is concerned, it's an ETC texture and we should return the relevant ETC mesa format. This condition can get hit when using glTexStorage to create the texture object. Signed-off-by: Ilia Mirkin Reviewed-by: Marek Olšák Cc: "11.2 12.0" --- diff --git a/src/mesa/state_tracker/st_format.c b/src/mesa/state_tracker/st_format.c index acb7725..99527b7 100644 --- a/src/mesa/state_tracker/st_format.c +++ b/src/mesa/state_tracker/st_format.c @@ -37,6 +37,7 @@ #include "main/enums.h" #include "main/formats.h" #include "main/glformats.h" +#include "main/texcompress.h" #include "main/texgetimage.h" #include "main/teximage.h" #include "main/texstore.h" @@ -2284,6 +2285,12 @@ st_ChooseTextureFormat(struct gl_context *ctx, GLenum target, } if (pFormat == PIPE_FORMAT_NONE) { + /* lie about using etc1/etc2 natively if we do decoding tricks */ + mFormat = _mesa_glenum_to_compressed_format(internalFormat); + if ((mFormat == MESA_FORMAT_ETC1_RGB8 && !st->has_etc1) || + (_mesa_is_format_etc2(mFormat) && !st->has_etc2)) + return mFormat; + /* no luck at all */ return MESA_FORMAT_NONE; }