From 1e9c1cdf1fc221e90f248232c74ff93d1c26a936 Mon Sep 17 00:00:00 2001
From: Qing Tao <55564570+VickyAtAZ@users.noreply.github.com>
Date: Tue, 25 Jan 2022 13:34:56 -0800
Subject: [PATCH] Android devices have alignment issue with ASTC_6X6 textures.
 Swith to ASTC_4X4 to fix this issue. (#7144)

The astc_6x6 alignment issue will be investiagte seperately.

Signed-off-by: Qing Tao <55564570+VickyAtAZ@users.noreply.github.com>
---
 Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Albedo.preset | 2 +-
 .../ImageProcessingAtom/Assets/Config/AlbedoWithCoverage.preset | 2 +-
 .../Assets/Config/AlbedoWithGenericAlpha.preset                 | 2 +-
 .../Asset/ImageProcessingAtom/Assets/Config/Emissive.preset     | 2 +-
 .../Asset/ImageProcessingAtom/Assets/Config/Reflectance.preset  | 2 +-
 .../Assets/Config/UserInterface_Compressed.preset               | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Albedo.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Albedo.preset
index dc1f38d2da..f3745a3d1c 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Albedo.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Albedo.preset
@@ -19,7 +19,7 @@
                 "UUID": "{08A95286-ADB2-41E4-96EB-DB48F4726D6A}",
                 "Name": "Albedo",
                 "RGB_Weight": "CIEXYZ",
-                "PixelFormat": "ASTC_6x6",
+                "PixelFormat": "ASTC_4x4",
                 "MaxTextureSize": 2048,
                 "DiscardAlpha": true,
                 "IsPowerOf2": true,
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/AlbedoWithCoverage.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/AlbedoWithCoverage.preset
index 439a057410..6f2f46404e 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/AlbedoWithCoverage.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/AlbedoWithCoverage.preset
@@ -18,7 +18,7 @@
                 "UUID": "{57ED16B1-407B-4E29-BCFC-D3BAE60F2C85}",
                 "Name": "AlbedoWithCoverage",
                 "RGB_Weight": "CIEXYZ",
-                "PixelFormat": "ASTC_6x6",
+                "PixelFormat": "ASTC_4x4",
                 "IsPowerOf2": true,
                 "MipMapSetting": {
                     "MipGenType": "Box"
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/AlbedoWithGenericAlpha.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/AlbedoWithGenericAlpha.preset
index 3340fd39e4..1d0701a73a 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/AlbedoWithGenericAlpha.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/AlbedoWithGenericAlpha.preset
@@ -17,7 +17,7 @@
                 "UUID": "{5D9ECB52-4CD9-4CB8-80E3-10CAE5EFB8A2}",
                 "Name": "AlbedoWithGenericAlpha",
                 "RGB_Weight": "CIEXYZ",
-                "PixelFormat": "ASTC_6x6",
+                "PixelFormat": "ASTC_4x4",
                 "MaxTextureSize": 2048,
                 "MipMapSetting": {
                     "MipGenType": "Box"
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Emissive.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Emissive.preset
index 798b8d1657..edbe50b220 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Emissive.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Emissive.preset
@@ -15,7 +15,7 @@
                 "UUID": "{07041D83-E0C3-4726-8735-CA0FE550C9A0}",
                 "Name": "Emissive",
                 "RGB_Weight": "CIEXYZ",
-                "PixelFormat": "ASTC_6x6",
+                "PixelFormat": "ASTC_4x4",
                 "MaxTextureSize": 2048,
                 "DiscardAlpha": true
             },
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Reflectance.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Reflectance.preset
index 9e3c718978..de370fda29 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Reflectance.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Reflectance.preset
@@ -20,7 +20,7 @@
                 "Name": "Reflectance",
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
-                "PixelFormat": "ASTC_6x6",
+                "PixelFormat": "ASTC_4x4",
                 "Swizzle": "rrr1",
                 "MaxTextureSize": 2048,
                 "IsPowerOf2": true,
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/UserInterface_Compressed.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/UserInterface_Compressed.preset
index 7e2c42fa6b..cd1b00b2fb 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/UserInterface_Compressed.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/UserInterface_Compressed.preset
@@ -16,7 +16,7 @@
                 "UUID": "{2828FBFE-BDF9-45A7-9370-F93822719CCF}",
                 "Name": "UserInterface_Compressed",
                 "SuppressEngineReduce": true,
-                "PixelFormat": "ASTC_6x6"
+                "PixelFormat": "ASTC_4x4"
             },
             "ios": {
                 "UUID": "{2828FBFE-BDF9-45A7-9370-F93822719CCF}",