diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c
index f306eea9237..efb459a01f9 100644
--- a/src/mesa/state_tracker/st_context.c
+++ b/src/mesa/state_tracker/st_context.c
@@ -568,20 +568,13 @@ st_create_context_priv(struct gl_context *ctx, struct pipe_context *pipe,
                        screen->is_format_supported(screen, PIPE_FORMAT_DXT1_SRGBA,
                                                    PIPE_TEXTURE_2D, 0, 0,
                                                    PIPE_BIND_SAMPLER_VIEW);
-   st->transcode_astc_to_bptc = options->transcode_astc &&
-      screen->is_format_supported(screen, PIPE_FORMAT_BPTC_SRGBA,
-                                  PIPE_TEXTURE_2D, 0, 0,
-                                  PIPE_BIND_SAMPLER_VIEW) &&
-      screen->is_format_supported(screen, PIPE_FORMAT_BPTC_RGBA_UNORM,
-                                  PIPE_TEXTURE_2D, 0, 0,
-                                  PIPE_BIND_SAMPLER_VIEW);
-   st->transcode_astc_to_dxt5 = options->transcode_astc &&
-      screen->is_format_supported(screen, PIPE_FORMAT_DXT5_SRGBA,
-                                  PIPE_TEXTURE_2D, 0, 0,
-                                  PIPE_BIND_SAMPLER_VIEW) &&
-      screen->is_format_supported(screen, PIPE_FORMAT_DXT5_RGBA,
-                                  PIPE_TEXTURE_2D, 0, 0,
-                                  PIPE_BIND_SAMPLER_VIEW);
+   st->transcode_astc = options->transcode_astc &&
+                        screen->is_format_supported(screen, PIPE_FORMAT_DXT5_SRGBA,
+                                                    PIPE_TEXTURE_2D, 0, 0,
+                                                    PIPE_BIND_SAMPLER_VIEW) &&
+                        screen->is_format_supported(screen, PIPE_FORMAT_DXT5_RGBA,
+                                                    PIPE_TEXTURE_2D, 0, 0,
+                                                    PIPE_BIND_SAMPLER_VIEW);
    st->has_astc_2d_ldr =
       screen->is_format_supported(screen, PIPE_FORMAT_ASTC_4x4_SRGB,
                                   PIPE_TEXTURE_2D, 0, 0, PIPE_BIND_SAMPLER_VIEW);
diff --git a/src/mesa/state_tracker/st_context.h b/src/mesa/state_tracker/st_context.h
index 1498884b31e..d3eb1075617 100644
--- a/src/mesa/state_tracker/st_context.h
+++ b/src/mesa/state_tracker/st_context.h
@@ -140,8 +140,7 @@ struct st_context
    boolean has_etc1;
    boolean has_etc2;
    boolean transcode_etc;
-   boolean transcode_astc_to_bptc;
-   boolean transcode_astc_to_dxt5;
+   boolean transcode_astc;
    boolean has_astc_2d_ldr;
    boolean has_astc_5x5_ldr;
    boolean prefer_blit_based_texture_transfer;
diff --git a/src/mesa/state_tracker/st_format.c b/src/mesa/state_tracker/st_format.c
index fadd03073aa..252e0810d0c 100644
--- a/src/mesa/state_tracker/st_format.c
+++ b/src/mesa/state_tracker/st_format.c
@@ -111,19 +111,11 @@ st_mesa_format_to_pipe_format(const struct st_context *st,
 
    if (st_astc_format_fallback(st, mesaFormat)) {
       if (_mesa_is_format_srgb(mesaFormat)) {
-         if (st->transcode_astc_to_bptc)
-            return PIPE_FORMAT_BPTC_SRGBA;
-         else if (st->transcode_astc_to_dxt5)
-            return PIPE_FORMAT_DXT5_SRGBA;
-         else
-            return PIPE_FORMAT_R8G8B8A8_SRGB;
+         return st->transcode_astc ? PIPE_FORMAT_DXT5_SRGBA :
+                                     PIPE_FORMAT_R8G8B8A8_SRGB;
       } else {
-         if (st->transcode_astc_to_bptc)
-            return PIPE_FORMAT_BPTC_RGBA_UNORM;
-         else if (st->transcode_astc_to_dxt5)
-            return PIPE_FORMAT_DXT5_RGBA;
-         else
-            return PIPE_FORMAT_R8G8B8A8_UNORM;
+         return st->transcode_astc ? PIPE_FORMAT_DXT5_RGBA :
+                                     PIPE_FORMAT_R8G8B8A8_UNORM;
       }
    }