From 0719a5f646b26d7fe73a8e0bbc9cae081e8617d2 Mon Sep 17 00:00:00 2001 From: Jonathan Marek Date: Tue, 5 Feb 2019 11:04:52 -0500 Subject: [PATCH] st/mesa: add ATC support Signed-off-by: Ilia Mirkin Signed-off-by: Jonathan Marek Reviewed-by: Roland Scheidegger --- src/mesa/state_tracker/st_extensions.c | 5 +++++ src/mesa/state_tracker/st_format.c | 14 ++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c index 828adab47c8..3851c4ec6cc 100644 --- a/src/mesa/state_tracker/st_extensions.c +++ b/src/mesa/state_tracker/st_extensions.c @@ -952,6 +952,11 @@ void st_init_extensions(struct pipe_screen *screen, { PIPE_FORMAT_X24S8_UINT, PIPE_FORMAT_S8X24_UINT }, GL_TRUE }, /* at least one format must be supported */ + + { { o(AMD_compressed_ATC_texture) }, + { PIPE_FORMAT_ATC_RGB, + PIPE_FORMAT_ATC_RGBA_EXPLICIT, + PIPE_FORMAT_ATC_RGBA_INTERPOLATED } }, }; /* Required: vertex fetch support. */ diff --git a/src/mesa/state_tracker/st_format.c b/src/mesa/state_tracker/st_format.c index febde1a5e97..18d03cc4ada 100644 --- a/src/mesa/state_tracker/st_format.c +++ b/src/mesa/state_tracker/st_format.c @@ -602,6 +602,13 @@ st_mesa_format_to_pipe_format(const struct st_context *st, return PIPE_FORMAT_R8G8B8A8_SRGB; return PIPE_FORMAT_ASTC_12x12_SRGB; + case MESA_FORMAT_ATC_RGB: + return PIPE_FORMAT_ATC_RGB; + case MESA_FORMAT_ATC_RGBA_EXPLICIT: + return PIPE_FORMAT_ATC_RGBA_EXPLICIT; + case MESA_FORMAT_ATC_RGBA_INTERPOLATED: + return PIPE_FORMAT_ATC_RGBA_INTERPOLATED; + default: return PIPE_FORMAT_NONE; } @@ -1088,6 +1095,13 @@ st_pipe_format_to_mesa_format(enum pipe_format format) case PIPE_FORMAT_ASTC_12x12_SRGB: return MESA_FORMAT_SRGB8_ALPHA8_ASTC_12x12; + case PIPE_FORMAT_ATC_RGB: + return MESA_FORMAT_ATC_RGB; + case PIPE_FORMAT_ATC_RGBA_EXPLICIT: + return MESA_FORMAT_ATC_RGBA_EXPLICIT; + case PIPE_FORMAT_ATC_RGBA_INTERPOLATED: + return MESA_FORMAT_ATC_RGBA_INTERPOLATED; + default: return MESA_FORMAT_NONE; } -- 2.30.2