From 6836118cd28bf81021991e2356c6b8d455e7d726 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tapani=20P=C3=A4lli?= <tapani.palli@intel.com>
Date: Mon, 27 May 2024 14:36:34 +0300
Subject: [PATCH] anv/android: enable emulated astc for applications
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This layer was blocking Android emulated ASTC support as it did not
take "emu_astc_ldr" in to account.

Cc: mesa-stable
Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Tested-by: Mi, Yanfeng <yanfeng.mi@intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29415>
---
 src/intel/vulkan/layers/anv_android_layer.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/intel/vulkan/layers/anv_android_layer.c b/src/intel/vulkan/layers/anv_android_layer.c
index b9ccc60649c..b9b2a365915 100644
--- a/src/intel/vulkan/layers/anv_android_layer.c
+++ b/src/intel/vulkan/layers/anv_android_layer.c
@@ -38,7 +38,8 @@ VkResult anv_android_CreateImageView(
     * format.
     */
    if (fmt && fmt->layout == UTIL_FORMAT_LAYOUT_ASTC &&
-       device->info->verx10 >= 125) {
+       device->info->verx10 >= 125 &&
+       !(device->physical->has_astc_ldr || device->physical->emu_astc_ldr)) {
       return vk_errorf(device, VK_ERROR_OUT_OF_HOST_MEMORY,
                        "ASTC format not supported (%s).", __func__);
    }