Mesa (staging/18.2): mesa/st: ETC2 now uses R8G8B8A8_SRGB as fallback

[GitLab Mirror]

Module: Mesa
Branch: staging/18.2
Commit: 0c1832765f491f52acde43553f05fae1a136d806
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0c1832765f491f52acde43553f05fae1a136d806

Author: Gert Wollny <gert.wollny at collabora.com>
Date:   Thu Aug  9 12:46:52 2018 +0200

mesa/st: ETC2 now uses R8G8B8A8_SRGB as fallback

The check for ETC2 compatibility was not updated when the fallback
format was changed.

Fixes: 71867a0a61cea20bf3f6115692e70b0d60f0b70d
   st/mesa: Fall back to R8G8B8A8_SRGB for ETC2

Signed-off-by: Gert Wollny <gert.wollny at collabora.com>
Reviewed-by: Marek Olšák <marek.olsak at amd.com>
(cherry picked from commit e94095ec30462d4264c6d7c7dd4fbf8bc0d99c69)

---

 src/mesa/state_tracker/st_extensions.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c
index dbaf7f6f8f..c6d9731bb8 100644
--- a/src/mesa/state_tracker/st_extensions.c
+++ b/src/mesa/state_tracker/st_extensions.c
@@ -1229,7 +1229,7 @@ void st_init_extensions(struct pipe_screen *screen,
        screen->is_format_supported(screen, PIPE_FORMAT_R8G8B8A8_UNORM,
                                    PIPE_TEXTURE_2D, 0, 0,
                                    PIPE_BIND_SAMPLER_VIEW) &&
-       screen->is_format_supported(screen, PIPE_FORMAT_B8G8R8A8_SRGB,
+       screen->is_format_supported(screen, PIPE_FORMAT_R8G8B8A8_SRGB,
                                    PIPE_TEXTURE_2D, 0, 0,
                                    PIPE_BIND_SAMPLER_VIEW) &&
        screen->is_format_supported(screen, PIPE_FORMAT_R16_UNORM,